Lexie 1 rok pred
rodič
commit
9fed4b92f7

+ 15 - 0
src/api/jixiaoguanli/jitairibaobiao.js

@@ -933,4 +933,19 @@ export const  dedhGetRate= (params) => {
     method: 'get',
     params
   })
+}
+//设备运行跟踪---换型清场
+export const remodelGetTab = (data) => {
+  return service({
+    url: '/mes_server/facility/remodelGetTab',
+    method: 'get',
+    data
+  })
+}
+export const ModelChangeRecord = (params) => {
+  return service({
+    url: '/mes_server/facility/ModelChangeRecord',
+    method: 'get',
+    params
+  })
 }

+ 21 - 21
src/view/job/job/job.vue

@@ -66,27 +66,27 @@
 				highlight-current-row="true"
             >
               <!-- <el-table-column type="selection" width="55" /> -->
-              <el-table-column align="left" fixed="left" label="设备编号" prop="设备编号" width="90" />
-              <el-table-column align="left" fixed="left" label="设备名称" prop="设备名称" width="200" />
-              <el-table-column align="left" label="生产工序" prop="生产工序" width="160" />
-              <el-table-column align="left" label="日定额" prop="日定额" width="100" />
-              <el-table-column align="left" label="千件工价" prop="千件工价" width="90" />
-              <el-table-column align="left" label="机长" prop="机长" width="80" />
-              <el-table-column align="left" label="副机" prop="副机" width="80" />
-              <el-table-column align="left" label="调墨" prop="调墨" width="80" />
-              <el-table-column align="left" label="二手" prop="二手" width="80" />
-              <el-table-column align="left" label="飞达" prop="飞达" width="80" />
-              <el-table-column align="left" label="辅助" prop="辅助" width="80" />
-              <el-table-column align="left" label="放卷" prop="放卷" width="80" />
-              <el-table-column align="left" label="分切1" prop="分切1" width="80" />
-              <el-table-column align="left" label="分切2" prop="分切2" width="80" />
-              <el-table-column align="left" label="检验" prop="检验" width="80" />
-              <el-table-column align="left" label="使用部门" prop="使用部门" width="90" />
-              <el-table-column align="left" label="设备编组" prop="" width="90" />
-              <el-table-column align="left" label="创建用户" prop="sys_id" width="120" />
-              <el-table-column align="left" label="创建时间" prop="mod_rq" width="160" />
-              <el-table-column align="left" label="修改时间" prop="sys_rq" width="160" />
-              <el-table-column align="left" label="UNIQID" prop="UniqId" width="75" >
+              <el-table-column align="left" sortable fixed="left" label="设备编号" prop="设备编号" width="90" />
+              <el-table-column align="left" sortable fixed="left" label="设备名称" prop="设备名称" width="200" />
+              <el-table-column align="left" sortable label="生产工序" prop="生产工序" width="160" />
+              <el-table-column align="left" sortable label="日定额" prop="日定额" width="100" />
+              <el-table-column align="left" sortable label="千件工价" prop="千件工价" width="90" />
+              <el-table-column align="left" sortable label="机长" prop="机长" width="80" />
+              <el-table-column align="left" sortable label="副机" prop="副机" width="80" />
+              <el-table-column align="left" sortable label="调墨" prop="调墨" width="80" />
+              <el-table-column align="left" sortable label="二手" prop="二手" width="80" />
+              <el-table-column align="left" sortable label="飞达" prop="飞达" width="80" />
+              <el-table-column align="left" sortable label="辅助" prop="辅助" width="80" />
+              <el-table-column align="left" sortable label="放卷" prop="放卷" width="80" />
+              <el-table-column align="left" sortable label="分切1" prop="分切1" width="80" />
+              <el-table-column align="left" sortable label="分切2" prop="分切2" width="80" />
+              <el-table-column align="left" sortable label="检验" prop="检验" width="80" />
+              <el-table-column align="left" sortable label="使用部门" prop="使用部门" width="90" />
+              <el-table-column align="left" sortable label="设备编组" prop="" width="90" />
+              <el-table-column align="left" sortable label="创建用户" prop="sys_id" width="120" />
+              <el-table-column align="left" sortable label="创建时间" prop="mod_rq" width="160" />
+              <el-table-column align="left" sortable label="修改时间" prop="sys_rq" width="160" />
+              <el-table-column align="left" sortable label="UNIQID" prop="UniqId" width="75" >
               <!-- <el-table-column align="center" fixed="right" label="操作"  min-width="100"> -->
                <!-- <template #default="scope">
                   <el-button type="primary" link class="table-button" @click="getDetails(scope.row)">

+ 24 - 24
src/view/job/related/related.vue

@@ -33,18 +33,18 @@
 			   :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
 			   :header-cell-style="{ padding: '0px' }" @row-click="ontable" @row-dblclick="doubleClick">
               <!-- <el-table-column type="selection" width="55" /> -->
-			  <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="160"/>
-			  <el-table-column align="left" label="所在部门" prop="所在部门" width="160"/>
-			  <el-table-column align="left" label="日期" prop="日期" width="160"/>
-			  <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="120"/>
-              <el-table-column align="left" label="关联加班工资" prop="个人加班工资" width="160"/>
-			  <el-table-column align="left" label="关联额定补差" prop="计时" width="160"/>
-              <el-table-column align="left" label="关联计时工资" prop="计时工资" width="160"/>
-              <el-table-column align="left" label="关联工资合计" prop="日工资合计" width="120"/>
+			  <el-table-column align="left" sortable label="员工编号" prop="员工编号" width="120"/>
+              <el-table-column align="left" sortable label="员工姓名" prop="员工姓名" width="120"/>
+			  <el-table-column align="left" sortable label="职称职务" prop="职称职务" width="160"/>
+			  <el-table-column align="left" sortable label="所在部门" prop="所在部门" width="160"/>
+			  <el-table-column align="left" sortable label="日期" prop="日期" width="160"/>
+			  <el-table-column align="left" sortable label="关联系数" prop="关联系数" width="120"/>
+              <el-table-column align="left" sortable label="关联人数" prop="关联人数" width="120"/>
+              <el-table-column align="left" sortable label="关联计件工资" prop="个人计件工资" width="120"/>
+              <el-table-column align="left" sortable label="关联加班工资" prop="个人加班工资" width="160"/>
+			  <el-table-column align="left" sortable label="关联额定补差" prop="计时" width="160"/>
+              <el-table-column align="left" sortable label="关联计时工资" prop="计时工资" width="160"/>
+              <el-table-column align="left" sortable label="关联工资合计" prop="日工资合计" width="120"/>
             </el-table>
             <!-- 分页 -->
             <!-- <div class="gva-pagination">
@@ -60,18 +60,18 @@
 		    <el-table ref="multipleTable" style="width: 100%" height="300px" tooltip-effect="dark" :data="tableData2" row-key="ID"
 		      highlight-current-row="true" border @selection-change="handleSelectionChange" :show-overflow-tooltip="true" @row-dblclick="doubleClick">
 		      <el-table-column type="selection" width="55" />
-		  	  <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="120"/>
-		      <el-table-column align="left" label="职称职务" prop="职称职务" width="120"/>
-		      <el-table-column align="left" label="所在部门" prop="所在部门" width="160"/>
-		      <el-table-column align="left" label="被关联员工" prop="被关联员工" width="160"/>
-		      <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="120"/>
-			  <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="160"/>
+		  	  <el-table-column align="left" sortable label="日期" prop="日期" width="120"/>
+		      <el-table-column align="left" sortable label="员工编号" prop="员工编号" width="120"/>
+		      <el-table-column align="left" sortable label="员工姓名" prop="员工姓名" width="120"/>
+		      <el-table-column align="left" sortable label="职称职务" prop="职称职务" width="120"/>
+		      <el-table-column align="left" sortable label="所在部门" prop="所在部门" width="160"/>
+		      <el-table-column align="left" sortable label="被关联员工" prop="被关联员工" width="160"/>
+		      <el-table-column align="left" sortable label="被关联姓名" prop="被关联姓名" width="120"/>
+			  <el-table-column align="left" sortable label="权重" prop="权重" width="120"/>
+			  <el-table-column align="left" sortable label="计件工资" prop="个人计件工资" width="120"/>
+			  <el-table-column align="left" sortable label="加班工资" prop="个人加班工资" width="120"/>
+			  <el-table-column align="left" sortable label="定额补差" prop="定额补差" width="120"/>
+			  <el-table-column align="left" sortable label="计时工资" prop="计时工资" width="160"/>
 		    </el-table>
 		    <!-- 分页 -->
 		    <!-- <div class="gva-pagination">

+ 17 - 17
src/view/job/rewards/rewards.vue

@@ -73,103 +73,103 @@
                 align="left"
                 label="工单编号"
                 prop="sczl_gdbh"
-                width="90"
+                width="90" sortable
               />
               <el-table-column
                 align="left"
                 label="印件名称"
                 prop="yj_yjmc"
-                width="210"
+                width="210" sortable
               />
               <el-table-column
                 align="left"
                 label="日期"
                 prop="sczl_rq"
-                width="100"
+                width="100" sortable
               />
               <el-table-column
                 align="left"
                 label="流程单备注"
                 prop="sczl_numDesc"
-                width="100"
+                width="100" sortable
               />
               <el-table-column
                 align="left"
                 label="联数"
                 prop="sczl_ls"
-                width="70"
+                width="70" sortable
               />
               <el-table-column
                 align="left"
                 label="责任部门"
                 prop="责任部门"
-                width="90"
+                width="90" sortable
               />
               <el-table-column
                 align="left"
                 label="大废品数"
                 prop="sczl_cl"
-                width="90"
+                width="90" sortable
               />
               <el-table-column
                 align="left"
                 label="废品类型"
                 prop="sczl_fplxA"
-                width="100"
+                width="100" sortable
               />
               <el-table-column
                 align="left"
                 label="废品来源"
                 prop="sczl_fplxB"
-                width="90"
+                width="90" sortable
               />
               <el-table-column
                 align="left"
                 label="奖励班组"
                 prop="Jl_bzdh"
-                width="90"
+                width="90" sortable
               />
               <el-table-column
                 align="left"
                 label="检验员工"
                 prop="JL_bh1"
-                width="90"
+                width="90" sortable
               />
               <el-table-column
                 align="left"
                 label="责任班组"
                 prop="sczl_bzdh"
-                width="90"
+                width="90" sortable
               />
               <el-table-column
                 align="left"
                 label="责任员工1"
                 prop="sczl_bh1"
-                width="90"
+                width="90" sortable
               />
               <el-table-column
                 align="left"
                 label="责任员工2"
                 prop="sczl_bh2"
-                width="90"
+                width="90" sortable
               />
               <el-table-column
                 align="left"
                 label="创建用户"
                 prop="sys_id"
-                width="120"
+                width="120" sortable
               />
               <el-table-column
                 align="left"
                 label="创建时间"
                 prop="sys_rq"
-                width="160"
+                width="160" sortable
               />
               <el-table-column
                 align="left"
                 label="UNIQID"
                 prop="UniqId"
-                width="80"
+                width="80" sortable
               />
             </el-table>
             <div class="gva-pagination">

+ 19 - 8
src/view/job/sampling/sampling.vue

@@ -83,114 +83,125 @@
               <el-table-column
                 type="selection"
                 width="55"
+				
               />
               <el-table-column
                 align="center"
                 label="日期"
                 prop="Sczl_rq"
                 width="100"
+				sortable
               />
               <el-table-column
                 align="left"
                 label="员工编号"
                 prop="Sczl_bh"
                 width="90"
+				sortable
               />
               <el-table-column
                 align="left"
                 label="员工姓名"
                 prop="name"
                 width="90"
+				sortable
               />
               <el-table-column
                 align="left"
                 label="工单编号"
                 prop="Sczl_gdbh"
                 width="90"
+				sortable
               />
               <el-table-column
                 align="left"
                 label="产品名称"
                 prop="Gd_cpmc"
                 width="130"
+				sortable
               />
               <el-table-column
                 align="left"
                 label="工序名称"
                 prop="Sczl_gxmc"
                 width="95"
+				sortable
               />
               <el-table-column
                 align="left"
                 label="印件号"
                 prop="sczl_yjno"
                 width="70"
+				sortable
               />
               <el-table-column
                 align="left"
                 label="工序号"
                 prop="sczl_gxh"
                 width="70"
+				sortable
               />
               <el-table-column
                 align="left"
                 label="流程单号"
                 prop="Sczl_num"
                 width="85"
+				sortable
               />
               <el-table-column
                 align="left"
                 label="抽检数"
                 prop="Sczl_抽检数"
                 width="70"
+				sortable
               />
               <el-table-column
                 align="left"
                 label="A类废"
                 prop="sczl_A类废"
-                width="70"
+                width="70" sortable
               />
               <el-table-column
                 align="left"
                 label="B类废"
                 prop="sczl_B类废"
-                width="70"
+                width="70"  sortable
               />
               <el-table-column
                 align="left"
                 label="C类废"
                 prop="sczl_C类废"
-                width="70"
+                width="70" sortable
               />
               <el-table-column
                 align="left"
                 label="备注"
                 prop="Sczl_desc"
-                width="80"
+                width="80" sortable
               />
               <el-table-column
                 align="left"
                 label="创建用户"
                 prop="Sys_id"
-                width="120"
+                width="120" sortable
               />
               <el-table-column
                 align="left"
                 label="创建时间"
                 prop="Sys_rq"
-                width="160"
+                width="160" sortable
               />
               <el-table-column
                 align="left"
                 label="修改时间"
                 prop="Mod_rq"
-                width="120"
+                width="120" sortable
               />
               <el-table-column
                 align="left"
                 label="UNIQID"
                 prop="UniqId"
-                width="75"
+                width="75" sortable
               />
             </el-table>
             <div class="gva-pagination">

+ 4 - 0
src/view/performance/06-packingDocuments/index.vue

@@ -138,11 +138,13 @@
                 <el-table-column
                   label="工单编号"
                   width="100"
+				  
                 >
                   <template #default="{ row, $index }">
                     <el-input
                       v-model="row.sczl_gdbh"
                       @keyup.enter="handleEnter($index, row)"
+					  
                     />
                   </template>
                 </el-table-column>
@@ -329,6 +331,7 @@
               <el-table-column
                 type="selection"
                 width="55"
+				
               />
               <!-- 循环渲染列 -->
               <el-table-column
@@ -337,6 +340,7 @@
                 :prop="column.prop"
                 :label="column.label"
                 :width="column.width"
+				sortable
               />
             </el-table>
             <!-- 分页 -->

+ 1 - 0
src/view/performance/07-otherDocuments/index.vue

@@ -318,6 +318,7 @@
               :prop="column.prop"
               :label="column.label"
               :width="column.width"
+			  sortable
             />
 
           </el-table>

+ 1 - 0
src/view/performance/08-timesheet/index.vue

@@ -425,6 +425,7 @@
               :prop="column.prop"
               :label="column.label"
               :width="column.width"
+			  sortable
             />
 
           </el-table>

+ 1 - 0
src/view/performance/09-workOrderVerification/index.vue

@@ -103,6 +103,7 @@
                 :prop="column.prop"
                 :label="column.label"
                 :width="column.width"
+				sortable
               />
 
             </el-table>

+ 2 - 0
src/view/performance/12-orderAccounting/index.vue

@@ -174,6 +174,7 @@
                 :label="column.label"
                 :width="column.width"
                 show-overflow-tooltip="true"
+				sortable
               />
 
             </el-table>
@@ -203,6 +204,7 @@
               :label="column.label"
               :width="column.width"
               show-overflow-tooltip="true"
+			  sortable
             />
           </el-table>
         </layout-content>

+ 2 - 0
src/view/performance/14-overTimePayVerification/index.vue

@@ -77,6 +77,7 @@
                 :label="column.label"
                 :width="column.width"
                 show-overflow-tooltip="true"
+				sortable
               />
 
               // 下半数据展示
@@ -108,6 +109,7 @@
                 :label="column.label"
                 :width="column.width"
                 show-overflow-tooltip="true"
+				sortable
               />
             </el-table>
           </div>

+ 23 - 10
src/view/performance/Dayreports.vue

@@ -1510,11 +1510,18 @@ const ADD=ref('0')
 function onAdd() {
 	ADD.value='新增'
 	type.value = 'create'
-	if(typeof(lastCellValue)=='number'){
-		GetInfo(lastCellValue)
-	}
-	initFormData()
-	dialogFormVisible.value = true
+	if(table_type=='db_sczl'){	 
+		if(typeof(lastCellValue)=='number'){
+			GetInfo(lastCellValue)
+		}
+		initFormData()
+		dialogFormVisible.value = true
+	}else{
+		  // GetInfo(table.value)
+		  console.log(['table_type'])
+		  console.log('此数据无法新增')
+	}  
+	
 	// Productionadd()
 }
 //新增
@@ -1886,24 +1893,29 @@ const updateDetailData = async() => {
   // console.log(FormData)
 }
 let table=ref(5);
-let lastCellValue=ref()
+let lastCellValue=ref()
+let table_type=ref()
 // 双击表格操作
 const type = ref('')
 function doubleClick(row, column, event) {
   type.value = 'update';
     lastCellValue= row['UniqId'];
   table.value=lastCellValue
-  if(row['table_type']=='db_sczl'){
+  if(row['table_type']=='db_sczl'){
+	  console.log(['table_type'])
   	 dialogFormVisible.value = true
   	 GetInfo(table.value)
-  }else{
+  }else{
+	  // GetInfo(table.value)
+	  console.log(['table_type'])
 	  console.log('此数据不展示详细信息')
   }  
 }
 // 单击表格操作
 function Click(row, column, event) {
     lastCellValue= row['UniqId'];
-	console.log(lastCellValue)
+	console.log(lastCellValue)
+	table_type=row['table_type']
   // if(row['table_type']=='db_sczl'){
   // 	 dialogFormVisible.value = true
   // 	 GetInfo(table.value)
@@ -1914,7 +1926,8 @@ function Click(row, column, event) {
 //获取详细信息
 const GetInfo = async (value) => {
   const response = await productionInfo({UniqId:value});
-  if (response.code === 0) {
+  if (response.code === 0) {
+	  console.log(response)
 	formData.value=response.data;
 	console.log(formData)
   }

+ 2 - 2
src/view/performance/chejianbaogong.vue

@@ -1461,7 +1461,7 @@
 			  <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>
 		   
@@ -1502,7 +1502,7 @@
 			  <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>
 		  

+ 30 - 30
src/view/performance/yuangongrigongzi.vue

@@ -33,14 +33,14 @@
 			   :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
 			   :header-cell-style="{ padding: '0px' }" @row-click="ontable" @row-dblclick="doubleClick">
               <el-table-column type="selection" width="55" />
-			  <el-table-column align="left" label="员工编号" prop="bh" width="120"/>
-              <el-table-column align="left" label="员工姓名" prop="员工姓名" width="120"/>
-              <el-table-column align="left" label="日期" prop="sczl_rq" width="120"/>
-              <el-table-column align="left" label="计件工资" prop="计件工资" width="120"/>
-              <el-table-column align="left" label="加班工资" prop="加班工资" width="160"/>
-			  <el-table-column align="left" label="计时时数" prop="计时" width="160"/>
-              <el-table-column align="left" label="计时工资" prop="计时工资" width="160"/>
-              <el-table-column align="left" label="日工资合计" prop="日工资合计" width="120"/>
+			  <el-table-column align="left" sortable label="员工编号" prop="bh" width="120"/>
+              <el-table-column align="left" sortable label="员工姓名" prop="员工姓名" width="120"/>
+              <el-table-column align="left" sortable label="日期" prop="sczl_rq" width="120"/>
+              <el-table-column align="left" sortable label="计件工资" prop="计件工资" width="120"/>
+              <el-table-column align="left" sortable label="加班工资" prop="加班工资" width="160"/>
+			  <el-table-column align="left" sortable label="计时时数" prop="计时" width="160"/>
+              <el-table-column align="left" sortable label="计时工资" prop="计时工资" width="160"/>
+              <el-table-column align="left" sortable label="日工资合计" prop="日工资合计" width="120"/>
             </el-table>
             <!-- 分页 -->
             <!-- <div class="gva-pagination">
@@ -56,28 +56,28 @@
 		    <el-table ref="multipleTable" style="width: 100%" tooltip-effect="dark" :data="tableData2" row-key="ID"
 		      highlight-current-row="true" border @selection-change="handleSelectionChange" :show-overflow-tooltip="true" @row-dblclick="doubleClick">
 		      <el-table-column type="selection" width="55" />
-		  	  <el-table-column align="left" label="日期" prop="sczl_rq" width="120"/>
-		      <el-table-column align="left" label="工单编号" prop="sczl_gdbh" width="120"/>
-		      <el-table-column align="left" label="产品名称" prop="Gd_cpmc" width="120"/>
-		      <el-table-column align="left" label="印件及工序" prop="sczl_type" width="120"/>
-		      <el-table-column align="left" label="机台编号" prop="sczl_jtbh" width="160"/>
-		      <el-table-column align="left" label="班组车头产量" prop="班组车头产量" width="160"/>
-		      <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="120"/>
-			  <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="160"/>
-			  <el-table-column align="left" label="打样工时" prop="打样工时" width="160"/>
-			  <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="120"/>
-			  <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="160"/>
-			  <el-table-column align="left" label="员工编号" prop="bh" width="160"/>
-			  <el-table-column align="left" label="姓名" prop="xm" width="120"/>
-			  <el-table-column align="left" label="比例" prop="Rate" width="120"/>
+		  	  <el-table-column align="left" sortable label="日期" prop="sczl_rq" width="120"/>
+		      <el-table-column align="left" sortable label="工单编号" prop="sczl_gdbh" width="120"/>
+		      <el-table-column align="left" sortable label="产品名称" prop="Gd_cpmc" width="120"/>
+		      <el-table-column align="left" sortable label="印件及工序" prop="sczl_type" width="120"/>
+		      <el-table-column align="left" sortable label="机台编号" prop="sczl_jtbh" width="160"/>
+		      <el-table-column align="left" sortable label="班组车头产量" prop="班组车头产量" width="160"/>
+		      <el-table-column align="left" sortable label="班组换算产量" prop="班组换算产量" width="120"/>
+			  <el-table-column align="left" sortable label="工序难度系数" prop="工序难度系数" width="120"/>
+			  <el-table-column align="left" sortable label="个人计件工资" prop="个人计件工资" width="120"/>
+			  <el-table-column align="left" sortable label="个人加班工资" prop="个人加班工资" width="120"/>
+			  <el-table-column align="left" sortable label="装版工时" prop="装版工时" width="120"/>
+			  <el-table-column align="left" sortable label="保养工时" prop="保养工时" width="160"/>
+			  <el-table-column align="left" sortable label="打样工时" prop="打样工时" width="160"/>
+			  <el-table-column align="left" sortable label="异常停机工时" prop="异常停机工时" width="120"/>
+			  <el-table-column align="left" sortable label="车头产量占用机时" prop="车头产量占用机时" width="120"/>
+			  <el-table-column align="left" sortable label="日定额" prop="日定额" width="120"/>
+			  <el-table-column align="left" sortable label="达标定额" prop="达标定额" width="120"/>
+			  <el-table-column align="left" sortable label="千件工价" prop="千件工价" width="120"/>
+			  <el-table-column align="left" sortable label="补产标准" prop="补产标准" width="160"/>
+			  <el-table-column align="left" sortable label="员工编号" prop="bh" width="160"/>
+			  <el-table-column align="left" sortable label="姓名" prop="xm" width="120"/>
+			  <el-table-column align="left" sortable label="比例" prop="Rate" width="120"/>
 		    </el-table>
 		    <!-- 分页 -->
 		    <!-- <div class="gva-pagination">

+ 65 - 65
src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -555,19 +555,19 @@
                       @row-click="tableRowClick"
                       :show-overflow-tooltip="true">
               <el-table-column type="selection" width="30" />
-              <el-table-column align="left" label="产品编号" prop="产品编号" width="115" />
-              <el-table-column align="left" label="产品名称" prop="产品名称" width="340" />
-              <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="100"/>
-              <el-table-column align="left" label="产品分类" prop="产品类别" width="100" />
-              <el-table-column align="left" label="最近接单时间" prop="receiveDate" width="160" />
-              <el-table-column align="left" label="印件数" prop="yjData" width="100" />
-              <el-table-column align="left" label="工艺" prop="gyData" width="100"/>
-              <el-table-column align="left" label="当前状态" prop="状态"  width="100"/>
-              <el-table-column align="left" label="最后修改" prop="Sys_id" width="160" />
-              <el-table-column align="left" label="建档日期" prop="Sys_rq" width="160" />
-              <el-table-column sortable align="left" label="更新日期" prop="Mod_rq" width="160" />
+              <el-table-column sortable  align="left" label="产品编号" prop="产品编号" width="115" />
+              <el-table-column sortable  align="left" label="产品名称" prop="产品名称" width="340" />
+              <el-table-column sortable  align="left" label="版本号" prop="版本号" width="100"/>
+              <el-table-column sortable  align="left" label="成品规格" prop="成品规格" width="100" />
+              <el-table-column sortable  align="left" label="单位" prop="计量单位" width="100"/>
+              <el-table-column sortable  align="left" label="产品分类" prop="产品类别" width="100" />
+              <el-table-column sortable  align="left" label="最近接单时间" prop="receiveDate" width="160" />
+              <el-table-column sortable  align="left" label="印件数" prop="yjData" width="100" />
+              <el-table-column  sortable align="left" label="工艺" prop="gyData" width="100"/>
+              <el-table-column sortable  align="left" label="当前状态" prop="状态"  width="100"/>
+              <el-table-column sortable  align="left" label="最后修改" prop="Sys_id" width="160" />
+              <el-table-column sortable  align="left" label="建档日期" prop="Sys_rq" width="160" />
+              <el-table-column  sortable  align="left" label="更新日期" prop="Mod_rq" width="160" />
             </el-table>
             <div class="gva-pagination">
               <el-pagination
@@ -594,20 +594,20 @@
                         :header-cell-style="{ padding: '0px' }"
                         @row-dblclick="yjupdateCompanyFunc"
                         style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="yjtableData" row-key="ID" @selection-change="handleSelectionChange">
-                <el-table-column type="selection" width="30" />
-                <el-table-column align="left" label="印件号" prop="yj_yjno"  width="80"/>
-                <el-table-column align="left" label="印件代号" prop="yj_yjdh" width="100" />
-                <el-table-column align="left" label="印件名称" prop="yj_yjmc" width="540" />
-                <el-table-column align="left" label="纸张单号" prop="yj_zzdh" width="100"/>
-                <el-table-column align="left" label="纸张名称" prop="yj_zzmc" width="340"/>
-                <el-table-column align="left" label="投料规格" prop="yj_tlgg" width="240"/>
-                <el-table-column align="left" label="开料规格" prop="yj_klgg" width="100"/>
-                <el-table-column align="left" label="开数" prop="yj_ks" width="80" />
-                <el-table-column align="left" label="联数" prop="yj_ls" width="80" />
-                <el-table-column align="left" label="备注" prop="yj_desc" width="200" />
-                <el-table-column align="left" label="建档用户" prop="sys_id" width="130" />
-                <el-table-column align="left" label="建档日期" prop="sys_rq" width="160" />
-                <el-table-column align="left" label="更新日期" prop="mod_rq" width="160"/>
+                <el-table-column sortable type="selection" width="30" />
+                <el-table-column sortable align="left" label="印件号" prop="yj_yjno"  width="80"/>
+                <el-table-column sortable align="left" label="印件代号" prop="yj_yjdh" width="100" />
+                <el-table-column sortable align="left" label="印件名称" prop="yj_yjmc" width="540" />
+                <el-table-column sortable align="left" label="纸张单号" prop="yj_zzdh" width="100"/>
+                <el-table-column sortable align="left" label="纸张名称" prop="yj_zzmc" width="340"/>
+                <el-table-column sortable align="left" label="投料规格" prop="yj_tlgg" width="240"/>
+                <el-table-column sortable align="left" label="开料规格" prop="yj_klgg" width="100"/>
+                <el-table-column sortable align="left" label="开数" prop="yj_ks" width="80" />
+                <el-table-column sortable align="left" label="联数" prop="yj_ls" width="80" />
+                <el-table-column sortable align="left" label="备注" prop="yj_desc" width="200" />
+                <el-table-column sortable align="left" label="建档用户" prop="sys_id" width="130" />
+                <el-table-column sortable align="left" label="建档日期" prop="sys_rq" width="160" />
+                <el-table-column sortable align="left" label="更新日期" prop="mod_rq" width="160"/>
               </el-table>
             </el-tab-pane>
 
@@ -623,27 +623,27 @@
                         style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="gytableData" row-key="ID" @selection-change="handleSelectionChange"
                         @row-click="clickybupdate">
                 <el-table-column type="selection" width="30" />
-                <el-table-column align="left" label="方案" prop="方案"  width="70"/>
-                <el-table-column align="left" label="印件" prop="Gy0_yjno" width="80" />
-                <el-table-column align="left" label="工序" prop="Gy0_gxh" width="70" />
-                <el-table-column align="left" label="工序名称" prop="gy0_gxmc" width="120" />
-                <el-table-column align="left" label="工序名称" prop="add_gxmc" width="340" />
-                <el-table-column align="left" label="开数" prop="Gy0_Ks" width="70" />
-                <el-table-column align="left" label="联数" prop="Gy0_ls" width="70" />
-                <el-table-column align="left" label="备注" prop="备注" width="150" />
-                <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="Gy0_Ms" width="100" />
-                <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="120"/>
-                <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="120"/>
-                <el-table-column align="left" label="设备编号" prop="Gy0_sbmc" width="100"/>
-                <el-table-column align="left" label="最后修改" prop="最后修改" width="160"/>
-                <el-table-column align="left" label="建档日期" prop="建档日期" width="160"/>
-                <el-table-column align="left" label="更新日期" prop="更新日期" width="160"/>
+                <el-table-column align="left" sortable  label="方案" prop="方案"  width="70"/>
+                <el-table-column align="left" sortable  label="印件" prop="Gy0_yjno" width="80" />
+                <el-table-column align="left" sortable  label="工序" prop="Gy0_gxh" width="70" />
+                <el-table-column align="left" sortable  label="工序名称" prop="gy0_gxmc" width="120" />
+                <el-table-column align="left" sortable  label="工序名称" prop="add_gxmc" width="340" />
+                <el-table-column align="left" sortable  label="开数" prop="Gy0_Ks" width="70" />
+                <el-table-column align="left" sortable  label="联数" prop="Gy0_ls" width="70" />
+                <el-table-column align="left"  sortable label="备注" prop="备注" width="150" />
+                <el-table-column align="left" sortable  label="工价系数" prop="工价系数" width="100" />
+                <el-table-column align="left" sortable  label="损耗系数" prop="损耗系数" width="100" />
+                <el-table-column align="left" sortable  label="计损色数" prop="Gy0_Ms" width="100" />
+                <el-table-column align="left" sortable  label="人工检_正品版" prop="人工检_正品版" width="120" />
+                <el-table-column align="left" sortable  label="人工检_次品版" prop="人工检_正品版" width="120" />
+                <el-table-column align="left" sortable  label="人工检_废检" prop="人工检_废检" width="120"/>
+                <el-table-column align="left" sortable  label="机检_正品版" prop="机检_正品版" width="120"/>
+                <el-table-column align="left" sortable  label="机检_次品检" prop="机检_次品检" width="120"/>
+                <el-table-column align="left" sortable  label="机检_废检" prop="机检_废检" width="120"/>
+                <el-table-column align="left" sortable  label="设备编号" prop="Gy0_sbmc" width="100"/>
+                <el-table-column align="left" sortable  label="最后修改" prop="最后修改" width="160"/>
+                <el-table-column align="left" sortable  label="建档日期" prop="建档日期" width="160"/>
+                <el-table-column align="left" sortable  label="更新日期" prop="更新日期" width="160"/>
               </el-table>
             </el-tab-pane>
 
@@ -658,15 +658,15 @@
                         style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="ybtableData" row-key="ID" @selection-change="handleSelectionChange"
               >
                 <el-table-column type="selection" width="30" />
-                <el-table-column align="left" label="方案" prop="YB_方案"  width="70"/>
-                <el-table-column align="left" label="印件号" prop="YB_Yjno" width="80" />
-                <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="440"/>
-                <el-table-column align="left" label="考核印数" prop="考核印数" width="100"/>
-                <el-table-column align="left" label="建档用户" prop="Sys_id" width="120" />
-                <el-table-column align="left" label="建档日期" prop="建档日期" width="160" />
-                <el-table-column align="left" label="更新日期" prop="更新日期" width="160" />
+                <el-table-column align="left" sortable label="方案" prop="YB_方案"  width="70"/>
+                <el-table-column align="left" sortable label="印件号" prop="YB_Yjno" width="80" />
+                <el-table-column align="left" sortable label="印版类别" prop="印版类别" width="100" />
+                <el-table-column align="left" sortable label="存货编码" prop="存货编码" width="100"/>
+                <el-table-column align="left" sortable label="印版名称" prop="印版名称"  width="440"/>
+                <el-table-column align="left" sortable label="考核印数" prop="考核印数" width="100"/>
+                <el-table-column align="left" sortable label="建档用户" prop="Sys_id" width="120" />
+                <el-table-column align="left" sortable label="建档日期" prop="建档日期" width="160" />
+                <el-table-column align="left" sortable label="更新日期" prop="更新日期" width="160" />
               </el-table>
             </el-tab-pane>
 
@@ -679,14 +679,14 @@
                         highlight-current-row="true"
                         style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="jstableData" row-key="ID" @selection-change="handleSelectionChange">
                 <!--              <el-table-column type="selection" width="55" />-->
-                <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="120" />
-                <el-table-column align="left" label="文件类型" prop="文件类型" width="120"/>
-                <el-table-column align="left" label="关联产品" prop="关联产品"  width="360"/>
-                <el-table-column align="left" label="建档用户" prop="建档用户" width="120"/>
-                <el-table-column align="left" label="建档日期" prop="建档日期" width="160" />
-                <el-table-column align="left" label="更新日期" prop="更新日期" width="160" />
+                <el-table-column align="left" sortable label="序号" prop="序号"  width="120"/>
+                <el-table-column align="left" sortable label="适用工序" prop="适用工序" width="120" />
+                <el-table-column align="left" sortable label="备注" prop="备注" width="120" />
+                <el-table-column align="left" sortable label="文件类型" prop="文件类型" width="120"/>
+                <el-table-column align="left" sortable label="关联产品" prop="关联产品"  width="360"/>
+                <el-table-column align="left" sortable label="建档用户" prop="建档用户" width="120"/>
+                <el-table-column align="left" sortable label="建档日期" prop="建档日期" width="160" />
+                <el-table-column align="left" sortable label="更新日期" prop="更新日期" width="160" />
               </el-table>
             </el-tab-pane>
 

+ 20 - 20
src/view/yunyin/renliziyuan/renyuanjibenziliao.vue

@@ -45,26 +45,26 @@
                       highlight-current-row="true" @row-dblclick="updateCompanyFunc"
                       @row-click="tableRowClick" :show-overflow-tooltip="true"
                       @selection-change="handleSelectionChange">
-              <el-table-column  align="center" label="员工编号" prop="员工编号"  width="80" />
-              <el-table-column  align="left" label="员工姓名" prop="员工姓名"  width="80"/>
-              <el-table-column  align="center" label="性别" prop="性别" width="45"/>
-              <el-table-column  align="left" label="聘用日期" prop="聘用日期" width="110" />
-              <el-table-column  align="left" label="转正日期" prop="转正日期" width="110" />
-              <el-table-column  align="left" label="所在部门" prop="所在部门" width="110"  />
-              <el-table-column  align="left" label="职称职务" prop="职称职务" width="100" />
-              <el-table-column  align="left" label="身份证号" prop="身份证号" width="160" />
-              <el-table-column  align="left" label="出生日期" prop="出生日期" width="110" />
-              <el-table-column  align="left" label="人员性质" prop="人员性质" width="110" />
-              <el-table-column  align="left" label="人员类别" prop="人员类别" width="90" />
-              <el-table-column  align="left" label="班次类型" prop="班次类型" width="120" />
-              <el-table-column  align="left" label="工资表类别" prop="工资表类别" width="160" />
-              <el-table-column  align="left" label="薪酬核算分组" prop="薪酬核算分组" width="110" />
-              <el-table-column  align="left" label="MES在职" prop="在职状态" width="80" />
-              <el-table-column  align="left" label="U8在职" prop="U8在职" width="80" />
-              <el-table-column  align="left" label="U8离职日期" prop="U8离职日期" width="110" />
-              <el-table-column  align="left" label="创建用户" prop="sys_id" width="110" />
-              <el-table-column  align="left" label="创建时间" prop="sys_rq" width="110" />
-              <el-table-column  align="left" label="修改时间" prop="mod_rq" width="110" />
+              <el-table-column  sortable align="center" label="员工编号" prop="员工编号"  width="80" />
+              <el-table-column  sortable align="left" label="员工姓名" prop="员工姓名"  width="80"/>
+              <el-table-column  sortable  align="center" label="性别" prop="性别" width="45"/>
+              <el-table-column  sortable  align="left" label="聘用日期" prop="聘用日期" width="110" />
+              <el-table-column  sortable  align="left" label="转正日期" prop="转正日期" width="110" />
+              <el-table-column  sortable  align="left" label="所在部门" prop="所在部门" width="110"  />
+              <el-table-column  sortable  align="left" label="职称职务" prop="职称职务" width="100" />
+              <el-table-column  sortable  align="left" label="身份证号" prop="身份证号" width="160" />
+              <el-table-column  sortable  align="left" label="出生日期" prop="出生日期" width="110" />
+              <el-table-column  sortable  align="left" label="人员性质" prop="人员性质" width="110" />
+              <el-table-column  sortable  align="left" label="人员类别" prop="人员类别" width="90" />
+              <el-table-column  sortable  align="left" label="班次类型" prop="班次类型" width="120" />
+              <el-table-column  sortable  align="left" label="工资表类别" prop="工资表类别" width="160" />
+              <el-table-column  sortable  align="left" label="薪酬核算分组" prop="薪酬核算分组" width="110" />
+              <el-table-column  sortable  align="left" label="MES在职" prop="在职状态" width="80" />
+              <el-table-column  sortable  align="left" label="U8在职" prop="U8在职" width="80" />
+              <el-table-column  sortable  align="left" label="U8离职日期" prop="U8离职日期" width="110" />
+              <el-table-column  sortable  align="left" label="创建用户" prop="sys_id" width="110" />
+              <el-table-column  sortable  align="left" label="创建时间" prop="sys_rq" width="110" />
+              <el-table-column  sortable  align="left" label="修改时间" prop="mod_rq" width="110" />
             </el-table>
 
             <!-- 分页 -->

+ 27 - 27
src/view/yunyin/shengchanguanli/chengpinrucang.vue

@@ -32,33 +32,33 @@
             <el-table ref="multipleTable" style="width: 100%" tooltip-effect="dark" :data="tableData" row-key="ID" @row-click="Click"
               highlight-current-row="true" border @selection-change="handleSelectionChange" :show-overflow-tooltip="true" @row-dblclick="doubleClick">
               <el-table-column type="selection" width="55" />
-			  <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="120"/>
-              <el-table-column align="left" label="入仓单号" prop="jjcp_num" width="120"/>
-              <el-table-column align="left" label="工单编号" prop="jjcp_gdbh" width="160"/>
-              <el-table-column align="left" label="印件号" prop="jjcp_yjno" width="160"/>
-              <el-table-column align="left" label="入仓数量" prop="jjcp_sl" width="120"/>
-			  <el-table-column align="left" label="累计入仓数量" prop="jjcp_sls" width="120"/>
-			  <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="jjcp_dw" width="120"/>
-			  <el-table-column align="left" label="入仓日期" prop="jjcp_sj" width="160"/>
-			  <el-table-column align="left" label="首末版" prop="jjcp_smb" width="160"/>
-			  <el-table-column align="left" label="印件代号" prop="jjcp_cpdh" width="120"/>
-			  <el-table-column align="left" label="印件名称" prop="jjcp_cpmc" width="120"/>
-			  <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="120"/>
-			  <el-table-column align="left" label="备注" prop="jjcp_desc" width="160"/>
-			  <el-table-column align="left" label="客户编号" prop="客户编号" width="160"/>
-			  <el-table-column align="left" label="客户名称" prop="Gd_客户名称" width="120"/>
-			  <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="Sys_id" width="120"/>
-			  <el-table-column align="left" label="创建时间" prop="sys_rq" width="160"/>
-			  <el-table-column align="left" label="修改时间" prop="mod_rq" width="160"/>
-			  <el-table-column align="left" label="UNIQID" prop="UniqId" width="120"/>
+			  <el-table-column align="left" sortable  label="入仓类型" prop="入仓类型" width="120"/>
+              <el-table-column align="left" sortable  label="仓库编号" prop="仓库编号" width="120"/>
+              <el-table-column align="left"  sortable label="仓库名称" prop="仓库名称" width="120"/>
+              <el-table-column align="left" sortable  label="入仓单号" prop="jjcp_num" width="120"/>
+              <el-table-column align="left" sortable  label="工单编号" prop="jjcp_gdbh" width="160"/>
+              <el-table-column align="left" sortable  label="印件号" prop="jjcp_yjno" width="160"/>
+              <el-table-column align="left" sortable  label="入仓数量" prop="jjcp_sl" width="120"/>
+			  <el-table-column align="left" sortable  label="累计入仓数量" prop="jjcp_sls" width="120"/>
+			  <el-table-column align="left" sortable label="订单数量" prop="订单数量" width="120"/>
+			  <el-table-column align="left" sortable label="完成率" prop="完成率" width="120"/>
+			  <el-table-column align="left" sortable label="单位" prop="jjcp_dw" width="120"/>
+			  <el-table-column align="left" sortable label="入仓日期" prop="jjcp_sj" width="160"/>
+			  <el-table-column align="left" sortable label="首末版" prop="jjcp_smb" width="160"/>
+			  <el-table-column align="left" sortable label="印件代号" prop="jjcp_cpdh" width="120"/>
+			  <el-table-column align="left" sortable label="印件名称" prop="jjcp_cpmc" width="120"/>
+			  <el-table-column align="left" sortable label="产品编号" prop="成品编码" width="120"/>
+			  <el-table-column align="left" sortable label="产品名称" prop="成品名称" width="120"/>
+			  <el-table-column align="left" sortable label="客户料号" prop="客户料号" width="120"/>
+			  <el-table-column align="left" sortable label="备注" prop="jjcp_desc" width="160"/>
+			  <el-table-column align="left" sortable label="客户编号" prop="客户编号" width="160"/>
+			  <el-table-column align="left" sortable label="客户名称" prop="Gd_客户名称" width="120"/>
+			  <el-table-column align="left" sortable label="最近入仓日期" prop="最近入仓日期" width="120"/>
+			  <el-table-column align="left" sortable label="机型备注" prop="机型备注" width="120"/>
+			  <el-table-column align="left" sortable label="创建用户" prop="Sys_id" width="120"/>
+			  <el-table-column align="left" sortable label="创建时间" prop="sys_rq" width="160"/>
+			  <el-table-column align="left" sortable label="修改时间" prop="mod_rq" width="160"/>
+			  <el-table-column align="left" sortable label="UNIQID" prop="UniqId" width="120"/>
             </el-table>
             <!-- 分页 -->
             <div class="gva-pagination">

+ 32 - 32
src/view/yunyin/shengchanguanli/gongdanshengchan.vue

@@ -296,7 +296,7 @@
                         @selection-change="handleSelectionChange" :show-overflow-tooltip="true">
 
                 <template v-for="item in tableFields[currentNode]">
-                  <el-table-column :align="item.align" :label="item.title" :prop="item.prop" :width="item.width" />
+                  <el-table-column :align="item.align" :label="item.title" sortable :prop="item.prop" :width="item.width" />
                 </template>
               </el-table>
               <!-- 分页 -->
@@ -319,20 +319,20 @@
                           :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                           :header-cell-style="{ padding: '0px' }" highlight-current-row="true"
                           style="width: 100%;height: 45vh" border tooltip-effect="dark" :data="gytableData" row-key="ID" @selection-change="handleSelectionChange">
-                  <el-table-column align="left" label="工单编号" prop="工单编号"  width="90"/>
-                  <el-table-column align="left" label="重点工序" prop="重点工序"  width="90"/>
-                  <el-table-column align="left" label="印件工序及名称" prop="印件工序及名称"  width="500"/>
-                  <el-table-column align="left" label="工序备注" prop="工序备注"  width="150"/>
-                  <el-table-column align="left" label="机组" prop="机组"  width="80"/>
-                  <el-table-column align="left" label="小时产能" prop="小时产能"  width="90"/>
-                  <el-table-column align="left" label="生产工时" prop="生产工时"  width="90"/>
-                  <el-table-column align="left" label="辅助工时" prop="辅助工时"  width="90"/>
-                  <el-table-column align="left" label="印刷方式" prop="印刷方式"  width="90"/>
-                  <el-table-column align="left" label="版距" prop="版距"  width="70"/>
-                  <el-table-column align="left" label="创建用户" prop="创建用户"  width="100"/>
-                  <el-table-column align="left" label="创建时间" prop="创建时间"  width="110"/>
-                  <el-table-column align="left" label="修改时间" prop="修改时间"  width="110"/>
-                  <el-table-column align="left" label="UNIQID" prop="UNIQID"  width="90"/>
+                  <el-table-column align="left" sortable label="工单编号" prop="工单编号"  width="90"/>
+                  <el-table-column align="left" sortable label="重点工序" prop="重点工序"  width="90"/>
+                  <el-table-column align="left" sortable label="印件工序及名称" prop="印件工序及名称"  width="500"/>
+                  <el-table-column align="left" sortable label="工序备注" prop="工序备注"  width="150"/>
+                  <el-table-column align="left" sortable label="机组" prop="机组"  width="80"/>
+                  <el-table-column align="left" sortable label="小时产能" prop="小时产能"  width="90"/>
+                  <el-table-column align="left" sortable label="生产工时" prop="生产工时"  width="90"/>
+                  <el-table-column align="left" sortable label="辅助工时" prop="辅助工时"  width="90"/>
+                  <el-table-column align="left" sortable label="印刷方式" prop="印刷方式"  width="90"/>
+                  <el-table-column align="left" sortable label="版距" prop="版距"  width="70"/>
+                  <el-table-column align="left" sortable label="创建用户" prop="创建用户"  width="100"/>
+                  <el-table-column align="left" sortable label="创建时间" prop="创建时间"  width="110"/>
+                  <el-table-column align="left" sortable label="修改时间" prop="修改时间"  width="110"/>
+                  <el-table-column align="left" sortable label="UNIQID" prop="UNIQID"  width="90"/>
                 </el-table>
               </el-tab-pane>
 
@@ -342,22 +342,22 @@
                           :header-cell-style="{ padding: '0px' }" :show-overflow-tooltip="true"
                           :highlight-current-row="true"
                           style="width: 100%;height: 45vh" border tooltip-effect="dark" :data="yjtableData" row-key="ID" @selection-change="handleSelectionChange">
-                  <el-table-column align="left" label="工单编号" prop="工单编号"  width="90"/>
-                  <el-table-column align="left" label="印件号" prop="印件号"  width="70"/>
-                  <el-table-column align="left" label="印件代号" prop="印件代号"  width="100"/>
-                  <el-table-column align="left" label="印件名称" prop="印件名称"  width="240"/>
-                  <el-table-column align="left" label="纸张名称" prop="纸张名称"  width="230"/>
-                  <el-table-column align="left" label="投料规格" prop="投料规格"  width="100"/>
-                  <el-table-column align="left" label="成品数量" prop="成品数量"  width="90"/>
-                  <el-table-column align="left" label="实际投料" prop="实际投料"  width="90"/>
-                  <el-table-column align="left" label="投料单位" prop="投料单位"  width="85"/>
-                  <el-table-column align="left" label="平张投料" prop="平张投料"  width="90"/>
-                  <el-table-column align="left" label="联数" prop="联数"  width="70"/>
-                  <el-table-column align="left" label="开数" prop="开数"  width="70"/>
-                  <el-table-column align="left" label="创建用户" prop="创建用户"  width="110"/>
-                  <el-table-column align="left" label="创建时间" prop="创建时间"  width="110"/>
-                  <el-table-column align="left" label="修改时间" prop="修改时间"  width="110"/>
-                  <el-table-column align="left" label="UNIQID" prop="UNIQID"  width="90"/>
+                  <el-table-column align="left" sortable label="工单编号" prop="工单编号"  width="90"/>
+                  <el-table-column align="left" sortable label="印件号" prop="印件号"  width="70"/>
+                  <el-table-column align="left" sortable label="印件代号" prop="印件代号"  width="100"/>
+                  <el-table-column align="left" sortable label="印件名称" prop="印件名称"  width="240"/>
+                  <el-table-column align="left" sortable label="纸张名称" prop="纸张名称"  width="230"/>
+                  <el-table-column align="left" sortable label="投料规格" prop="投料规格"  width="100"/>
+                  <el-table-column align="left" sortable label="成品数量" prop="成品数量"  width="90"/>
+                  <el-table-column align="left" sortable label="实际投料" prop="实际投料"  width="90"/>
+                  <el-table-column align="left" sortable label="投料单位" prop="投料单位"  width="85"/>
+                  <el-table-column align="left" sortable label="平张投料" prop="平张投料"  width="90"/>
+                  <el-table-column align="left" sortable label="联数" prop="联数"  width="70"/>
+                  <el-table-column align="left" sortable label="开数" prop="开数"  width="70"/>
+                  <el-table-column align="left" sortable label="创建用户" prop="创建用户"  width="110"/>
+                  <el-table-column align="left" sortable label="创建时间" prop="创建时间"  width="110"/>
+                  <el-table-column align="left" sortable label="修改时间" prop="修改时间"  width="110"/>
+                  <el-table-column align="left" sortable label="UNIQID" prop="UNIQID"  width="90"/>
                 </el-table>
               </el-tab-pane>
             </el-tabs>
@@ -371,7 +371,7 @@
                         :cell-class-name="pczc_planUsageCellClass"
                         style="width: 100%;height: 45vh" border tooltip-effect="dark" :data="bottomData" row-key="ID" @selection-change="handleSelectionChange">
                 <template v-for="item in bottomTableF[currentNode]">
-                  <el-table-column :align="item.align" :label="item.title" :prop="item.prop" :width="item.width" />
+                  <el-table-column :align="item.align" :label="item.title"  :prop="item.prop" :width="item.width" />
                 </template>
               </el-table>
             </div>

+ 65 - 65
src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -537,26 +537,26 @@
                       @selection-change="handleSelectionChange"
                       :show-overflow-tooltip="true">
                 <el-table-column align="center" type="selection" width="30"/>
-                <el-table-column align="left" label="获取状态"   prop="status"  width="81" />
-                <el-table-column align="left" label="工单编号"   prop="工单编号"  width="81" />
-                <el-table-column align="left" label="生产分类"   prop="生产分类" width="81" />
-                <el-table-column align="left" label="销售订单号" prop="销售订单号" width="100" />
-                <el-table-column align="left" label="产品代号"   prop="产品代号"  width="99" />
-                <el-table-column align="left" label="产品名称"   prop="产品名称" width="370" />
-                <el-table-column align="left" label="订单数量"   prop="订单数量" width="100" />
-                <el-table-column align="left" label="单位"       prop="单位"   width="54"/>
-                <el-table-column align="left" label="折合大箱"   prop="折合大箱" width="81" />
-                <el-table-column align="left" label="投料率"     prop="投料率" width="80" />
-                <el-table-column align="left" label="平均合格率"  prop="平均合格率" width="95" />
-                <el-table-column align="left" label="开单日期"    prop="开单日期" width="98" />
-                <el-table-column align="left" label="交货日期"    prop="交货日期" width="98" />
-                <el-table-column align="left" label="工单类型"    prop="工单类型" width="98" />
-                <el-table-column align="left" label="工单状态"    prop="工单状态" width="85" />
-                <el-table-column align="left" label="当前生产工序" prop="当前生产工序" width="110" />
-                <el-table-column align="left" label="产量提交时间" prop="产量提交时间" width="110" />
-                <el-table-column align="left" label="建档用户"    prop="建档用户" width="130" />
-                <el-table-column align="left" label="建档时间"    prop="建档时间" width="115" />
-                <el-table-column align="left" label="更新时间"    prop="更新时间" width="160" />
+                <el-table-column align="left" sortable label="获取状态"   prop="status"  width="81" />
+                <el-table-column align="left" sortable label="工单编号"   prop="工单编号"  width="81" />
+                <el-table-column align="left" sortable label="生产分类"   prop="生产分类" width="81" />
+                <el-table-column align="left" sortable label="销售订单号" prop="销售订单号" width="100" />
+                <el-table-column align="left" sortable label="产品代号"   prop="产品代号"  width="99" />
+                <el-table-column align="left" sortable label="产品名称"   prop="产品名称" width="370" />
+                <el-table-column align="left" sortable label="订单数量"   prop="订单数量" width="100" />
+                <el-table-column align="left" sortable label="单位"       prop="单位"   width="54"/>
+                <el-table-column align="left" sortable label="折合大箱"   prop="折合大箱" width="81" />
+                <el-table-column align="left" sortable label="投料率"     prop="投料率" width="80" />
+                <el-table-column align="left" sortable label="平均合格率"  prop="平均合格率" width="95" />
+                <el-table-column align="left" sortable label="开单日期"    prop="开单日期" width="98" />
+                <el-table-column align="left" sortable label="交货日期"    prop="交货日期" width="98" />
+                <el-table-column align="left" sortable label="工单类型"    prop="工单类型" width="98" />
+                <el-table-column align="left" sortable label="工单状态"    prop="工单状态" width="85" />
+                <el-table-column align="left" sortable label="当前生产工序" prop="当前生产工序" width="110" />
+                <el-table-column align="left" sortable label="产量提交时间" prop="产量提交时间" width="110" />
+                <el-table-column align="left" sortable label="建档用户"    prop="建档用户" width="130" />
+                <el-table-column align="left" sortable label="建档时间"    prop="建档时间" width="115" />
+                <el-table-column align="left" sortable label="更新时间"    prop="更新时间" width="160" />
             </el-table>
             <!-- 分页 -->
             <div class="gva-pagination">
@@ -583,18 +583,18 @@
                         @row-dblclick="gdyjupdateCompanyFunc"
                         style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="yjtableData" row-key="ID" @selection-change="handleSelectionChange">
                 <!--<el-table-column type="selection" width="55" />-->
-                <el-table-column align="left" label="印件号" prop="印件号"  width="70"/>
-                <el-table-column align="left" label="印件代号" prop="印件代号"  width="98"/>
-                <el-table-column align="left" label="印件名称" prop="印件名称"  width="340"/>
-                <el-table-column align="left" label="纸张代号" prop="纸张代号"  width="98"/>
-                <el-table-column align="left" label="纸张名称" prop="纸张名称"  width="340"/>
-                <el-table-column align="left" label="投料规格" prop="投料规格"  width="90"/>
-                <el-table-column align="left" label="平张投料" prop="平张投料"  width="90"/>
-                <el-table-column align="left" label="开料规格" prop="开料规格"  width="90"/>
-                <el-table-column align="left" label="开数*联数" prop="开数*联数"  width="90"/>
-                <el-table-column align="left" label="建档用户" prop="建档用户"  width="100"/>
-                <el-table-column align="left" label="建档时间" prop="建档时间"  width="160"/>
-                <el-table-column align="left" label="更新时间" prop="更新时间"  width="160"/>
+                <el-table-column align="left" sortable label="印件号" prop="印件号"  width="70"/>
+                <el-table-column align="left" sortable label="印件代号" prop="印件代号"  width="98"/>
+                <el-table-column align="left" sortable label="印件名称" prop="印件名称"  width="340"/>
+                <el-table-column align="left" sortable label="纸张代号" prop="纸张代号"  width="98"/>
+                <el-table-column align="left" sortable label="纸张名称" prop="纸张名称"  width="340"/>
+                <el-table-column align="left" sortable label="投料规格" prop="投料规格"  width="90"/>
+                <el-table-column align="left" sortable label="平张投料" prop="平张投料"  width="90"/>
+                <el-table-column align="left" sortable label="开料规格" prop="开料规格"  width="90"/>
+                <el-table-column align="left" sortable label="开数*联数" prop="开数*联数"  width="90"/>
+                <el-table-column align="left" sortable label="建档用户" prop="建档用户"  width="100"/>
+                <el-table-column align="left" sortable label="建档时间" prop="建档时间"  width="160"/>
+                <el-table-column align="left" sortable label="更新时间" prop="更新时间"  width="160"/>
               </el-table>
             </el-tab-pane>
 
@@ -612,32 +612,32 @@
                         :row-class-name="rowClassStyle2"
                         style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="gytableData" row-key="ID" @selection-change="handleSelectionChange">
                 <!-- <el-table-column type="selection" width="55" />-->
-                <el-table-column align="left" label="完工状态" prop="status"  width="75"/>
-                <el-table-column align="left" label="重点工序" prop="重点工序"  width="80"/>
-                <el-table-column align="left" label="印件-工序" prop="印件-工序"  width="80"/>
-                <el-table-column align="left" label="备选工序" prop="备选工序"  width="80"/>
-                <el-table-column align="left" label="工序名称" prop="工序名称"  width="280"/>
-                <el-table-column align="left" label="计划产量" prop="计划产量"  width="80"/>
-                <el-table-column align="left" label="基础损耗" prop="基础损耗"  width="80"/>
-                <el-table-column align="left" label="报废定额" prop="报废定额"  width="80"/>
-                <el-table-column align="left" label="允损比例" prop="允损比例"  width="80"/>
-                <el-table-column align="left" label="难度系数" prop="难度系数"  width="80"/>
-                <el-table-column align="left" label="损耗系数" prop="损耗系数"  width="80"/>
-                <el-table-column align="left" label="人工检_次品板" prop="人工检_次品板"  width="110"/>
-                <el-table-column align="left" label="人工检_废检" prop="人工检_废检"  width="110"/>
-                <el-table-column align="left" label="机检_正品板" prop="机检_正品板"  width="110"/>
-                <el-table-column align="left" label="机检_次品板" prop="机检_次品板"  width="110"/>
-                <el-table-column align="left" label="机检_废检" prop="机检_废检"  width="90"/>
+                <el-table-column align="left" sortable label="完工状态" prop="status"  width="75"/>
+                <el-table-column align="left" sortable label="重点工序" prop="重点工序"  width="80"/>
+                <el-table-column align="left" sortable label="印件-工序" prop="印件-工序"  width="80"/>
+                <el-table-column align="left" sortable label="备选工序" prop="备选工序"  width="80"/>
+                <el-table-column align="left" sortable label="工序名称" prop="工序名称"  width="280"/>
+                <el-table-column align="left" sortable label="计划产量" prop="计划产量"  width="80"/>
+                <el-table-column align="left" sortable label="基础损耗" prop="基础损耗"  width="80"/>
+                <el-table-column align="left" sortable label="报废定额" prop="报废定额"  width="80"/>
+                <el-table-column align="left" sortable label="允损比例" prop="允损比例"  width="80"/>
+                <el-table-column align="left" sortable label="难度系数" prop="难度系数"  width="80"/>
+                <el-table-column align="left" sortable label="损耗系数" prop="损耗系数"  width="80"/>
+                <el-table-column align="left" sortable label="人工检_次品板" prop="人工检_次品板"  width="110"/>
+                <el-table-column align="left" sortable label="人工检_废检" prop="人工检_废检"  width="110"/>
+                <el-table-column align="left" sortable label="机检_正品板" prop="机检_正品板"  width="110"/>
+                <el-table-column align="left" sortable label="机检_次品板" prop="机检_次品板"  width="110"/>
+                <el-table-column align="left" sortable label="机检_废检" prop="机检_废检"  width="90"/>
                 <!--<el-table-column align="left" label="开数*联数" prop="开数*联数"  width="100"/>-->
-                <el-table-column align="center" label="开数" prop="开数"  width="45"/>
-                <el-table-column align="center" label="联数" prop="联数"  width="45"/>
-                <el-table-column align="left" label="备注" prop="备注"  width="230"/>
-                <el-table-column align="left" label="印刷方式" prop="印刷方式"  width="80"/>
-                <el-table-column align="center" label="版距" prop="版距"  width="45"/>
-                <el-table-column align="left" label="建档用户" prop="建档用户"  width="90"/>
-                <el-table-column align="left" label="建档日期" prop="建档日期"  width="150"/>
-                <el-table-column align="left" label="更新时间" prop="更新时间"  width="150"/>
-                <el-table-column align="left" label="更新时间" prop="更新时间"  width="150"/>
+                <el-table-column align="center"  sortablelabel="开数" prop="开数"  width="45"/>
+                <el-table-column align="center" sortable label="联数" prop="联数"  width="45"/>
+                <el-table-column align="left" sortable label="备注" prop="备注"  width="230"/>
+                <el-table-column align="left" sortable label="印刷方式" prop="印刷方式"  width="80"/>
+                <el-table-column align="center" sortable label="版距" prop="版距"  width="45"/>
+                <el-table-column align="left" sortable label="建档用户" prop="建档用户"  width="90"/>
+                <el-table-column align="left" sortable label="建档日期" prop="建档日期"  width="150"/>
+                <el-table-column align="left" sortable label="更新时间" prop="更新时间"  width="150"/>
+                <el-table-column align="left" sortable label="更新时间" prop="更新时间"  width="150"/>
               </el-table>
             </el-tab-pane>
 
@@ -652,14 +652,14 @@
                         @row-dblclick="gdbomupdateCompanyFunc"
                         style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="bomtableData" row-key="ID" @selection-change="handleSelectionChange">
                 <el-table-column type="selection" width="30" />
-                <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="400"/>
-                <el-table-column align="left" label="消耗定量" prop="消耗定量"  width="210"/>
-                <el-table-column align="left" label="计划用量" prop="计划用量"  width="100" />
-                <el-table-column align="left" label="建档用户" prop="建档用户"  width="120"/>
-                <el-table-column align="left" label="建档时间" prop="建档时间"  width="160"/>
-                <el-table-column align="left" label="更新时间" prop="更新时间"  width="160"/>
+                <el-table-column align="left" sortable label="方案" prop="方案"  width="120"/>
+                <el-table-column align="left" sortable label="物料编号" prop="物料编号"  width="100"/>
+                <el-table-column align="left" sortable label="物料名称" prop="物料名称"  width="400"/>
+                <el-table-column align="left" sortable label="消耗定量" prop="消耗定量"  width="210"/>
+                <el-table-column align="left" sortable label="计划用量" prop="计划用量"  width="100" />
+                <el-table-column align="left" sortable label="建档用户" prop="建档用户"  width="120"/>
+                <el-table-column align="left" sortable label="建档时间" prop="建档时间"  width="160"/>
+                <el-table-column align="left" sortable label="更新时间" prop="更新时间"  width="160"/>
               </el-table>
             </el-tab-pane>
           </el-tabs>

+ 269 - 62
src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -10,6 +10,7 @@
 			<el-button type="primary" @click="onyinban">印版领退</el-button>
 			<el-button type="primary" @click="onstatus" >设置机台状态</el-button>
 			<el-button type="primary" @click="oncomplaints" >客诉记录</el-button>
+			<el-button type="primary" @click="onClear" >换型清场</el-button>
 		</header>
     <el-container>
       <el-aside width="200px">
@@ -153,16 +154,16 @@
                                     style="width: 100%;height: 330px" border tooltip-effect="dark" :data="sbzyData" row-key="ID" @selection-change="handleSelectionChange">
             <!--                <el-table-column type="selection" width="55" />-->
                             <!-- <el-table-column align="left" label="选择" prop="bh"  width="80"/> -->
-                            <el-table-column align="left" label="工单编号|质量信息" prop="工单编号|质量信息" width="145" />
-							<el-table-column align="left" label="印件资料" prop="印件资料" width="240" />
-                            <el-table-column align="left" label="工序名称" prop="工序名称" width="100" />
-                            <el-table-column align="left" label="计划产量/已完成" prop="计划产量/已完成" width="130"/>
-                            <el-table-column align="left" label="装版时数" prop="装版时数" width="85"/>
-                            <el-table-column align="left" label="工序产能" prop="工序产能" width="85"/>
-                            <el-table-column align="left" label="计划工时" prop="计划工时" width="85"/>
-                            <el-table-column align="left" label="计划生产时段" prop="计划生产时段" width="210" />
-                            <el-table-column align="left" label="排产备注" prop="排产备注" width="100" />
-                            <el-table-column align="left" label="产品名称" prop="产品名称" width="240" />
+                            <el-table-column align="left" sortable label="工单编号|质量信息" prop="工单编号|质量信息" width="145" />
+							<el-table-column align="left" sortable label="印件资料" prop="印件资料" width="240" />
+                            <el-table-column align="left" sortable label="工序名称" prop="工序名称" width="100" />
+                            <el-table-column align="left" sortable label="计划产量/已完成" prop="计划产量/已完成" width="130"/>
+                            <el-table-column align="left" sortable label="装版时数" prop="装版时数" width="85"/>
+                            <el-table-column align="left" sortable label="工序产能" prop="工序产能" width="85"/>
+                            <el-table-column align="left" sortable label="计划工时" prop="计划工时" width="85"/>
+                            <el-table-column align="left" sortable label="计划生产时段" prop="计划生产时段" width="210" />
+                            <el-table-column align="left" sortable label="排产备注" prop="排产备注" width="100" />
+                            <el-table-column align="left" sortable label="产品名称" prop="产品名称" width="240" />
                           </el-table>
                         </el-tab-pane>
             
@@ -179,17 +180,17 @@
                                     @row-click="clickybupdate">
             <!--                <el-table-column type="selection" width="55" />-->
                             <!-- <el-table-column align="left" label="选择" prop="方案"  width="70"/> -->
-                            <el-table-column align="left" label="班组号" prop="班组号" width="70" />
-                            <el-table-column align="left" label="组员1" prop="0" width="200" />
-                            <el-table-column align="left" label="组员2" prop="1" width="200" />
-                            <el-table-column align="left" label="组员3" prop="2" width="200" />
-                            <el-table-column align="left" label="组员4" prop="3" width="200" />
-                            <el-table-column align="left" label="组员5" prop="4" width="200" />
-                            <el-table-column align="left" label="组员6" prop="5" width="70" />
-                            <el-table-column align="left" label="组员7" prop="6" width="70" />
-                            <el-table-column align="left" label="组员8" prop="7" width="70" />
-                            <el-table-column align="left" label="组员9" prop="8" width="70" />
-                            <el-table-column align="left" label="组员10" prop="9_正品版" width="70" />
+                            <el-table-column align="left" sortable label="班组号" prop="班组号" width="70" />
+                            <el-table-column align="left" sortable label="组员1" prop="0" width="200" />
+                            <el-table-column align="left" sortable label="组员2" prop="1" width="200" />
+                            <el-table-column align="left" sortable label="组员3" prop="2" width="200" />
+                            <el-table-column align="left" sortable label="组员4" prop="3" width="200" />
+                            <el-table-column align="left" sortable label="组员5" prop="4" width="200" />
+                            <el-table-column align="left" sortable label="组员6" prop="5" width="70" />
+                            <el-table-column align="left" sortable label="组员7" prop="6" width="70" />
+                            <el-table-column align="left" sortable label="组员8" prop="7" width="70" />
+                            <el-table-column align="left" sortable label="组员9" prop="8" width="70" />
+                            <el-table-column align="left" sortable label="组员10" prop="9_正品版" width="70" />
                           </el-table>
                         </el-tab-pane>
             
@@ -204,27 +205,27 @@
                                   style="width: 100%;height: 400px" border tooltip-effect="dark" :data="CLMXData" row-key="ID" @selection-change="handleSelectionChange"
                                   >
             <!--              <el-table-column type="selection" width="55" />-->
-                          <el-table-column align="left" label="生产时段" prop="生产时间段"  width="180"/>
-                          <el-table-column align="left" label="工单编号" prop="工单编号" width="85" />
-                          <el-table-column align="left" label="产品名称" prop="产品名称" width="150" />
-                          <el-table-column align="left" label="印件及工序" prop="印件及工序" width="320"/>
-                          <el-table-column align="left" label="标牌号" prop="标牌号"  width="80"/>
-                          <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="100" />
-                          <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="100" />
-						  <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="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="100" />
-						  <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="100" />
-						  <el-table-column align="left" label="色度数" prop="色度数" width="100" />
+                          <el-table-column align="left" sortable label="生产时段" prop="生产时间段"  width="180"/>
+                          <el-table-column align="left" sortable label="工单编号" prop="工单编号" width="85" />
+                          <el-table-column align="left" sortable label="产品名称" prop="产品名称" width="150" />
+                          <el-table-column align="left" sortable label="印件及工序" prop="印件及工序" width="320"/>
+                          <el-table-column align="left" sortable label="标牌号" prop="标牌号"  width="80"/>
+                          <el-table-column align="left" sortable label="产量" prop="产量" width="100"/>
+                          <el-table-column align="left" sortable label="制程废品" prop="制程废品" width="100" />
+                          <el-table-column align="left" sortable label="制程次品" prop="制程次品" width="100" />
+                          <el-table-column align="left" sortable label="前工序废" prop="前工序废" width="100" />
+						  <el-table-column align="left" sortable label="来料异常" prop="来料异常"  width="100"/>
+						  <el-table-column align="left" sortable  label="装版工时" prop="装版工时" width="100" />
+						  <el-table-column align="left" sortable  label="保养工时" prop="保养工时" width="100" />
+						  <el-table-column align="left" sortable  label="打样工时" prop="打样工时" width="100"/>
+						  <el-table-column align="left"  sortable label="异常停机工时" prop="异常停机工时"  width="120"/>
+						  <el-table-column align="left" sortable  label="通电工时" prop="通电工时" width="100"/>
+						  <el-table-column align="left" sortable  label="码开始行" prop="码开始行" width="100" />
+						  <el-table-column align="left" sortable  label="码结束行" prop="码结束行" width="100" />
+						  <el-table-column align="left" sortable  label="码包" prop="码包" width="100" />
+						  <el-table-column align="left" sortable  label="主电表" prop="主电表"  width="100"/>
+						  <el-table-column align="left" sortable  label="辅电表" prop="辅电表" width="100" />
+						  <el-table-column align="left" sortable  label="色度数" prop="色度数" width="100" />
                         </el-table>
                         </el-tab-pane>
             
@@ -237,10 +238,10 @@
                                   highlight-current-row="true"
                                   style="width: 100%;height: 400px" border tooltip-effect="dark" :data="JYData" row-key="ID" @selection-change="handleSelectionChange">
             <!--              <el-table-column type="selection" width="55" />-->
-                          <el-table-column align="left" label="工单编号" prop="工单编号"  width="85"/>
-                          <el-table-column align="left" label="印件号" prop="印件号" width="70" />
-                          <el-table-column align="left" label="工序名称" prop="工序名称" width="85" />
-                          <el-table-column align="left" label="检验项目" prop="检验项目" width="85"/>
+                          <el-table-column align="left" sortable label="工单编号" prop="工单编号"  width="85"/>
+                          <el-table-column align="left" sortable label="印件号" prop="印件号" width="70" />
+                          <el-table-column align="left" sortable label="工序名称" prop="工序名称" width="85" />
+                          <el-table-column align="left" sortable label="检验项目" prop="检验项目" width="85"/>
                           <el-table-column
                              v-for="time in columnNames"
                              :key="time"
@@ -1150,6 +1151,153 @@
 					</div>
 		</el-dialog>
 		
+		
+		<el-dialog
+		  v-model="huanxingVisible"
+		  title="换型清场"
+		  destroy-on-close
+		  width="1100px"
+		  style="height: 78%;"
+		>
+		  <div style="display: flex;">
+		    <div style="flex: 0.1;">
+		      <el-aside width="180px" 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>
+		        </div>
+		      </el-aside>
+		    </div>
+		    <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">
+		          
+		        </el-tab-pane>
+		      
+		        <el-tab-pane label="当前设备换型记录" style="width: 110%;"  @click="showTable('当前设备换型记录')"  name="second">
+		          <el-table
+		            tooltip-effect="dark"
+		            :data="huanxingselectData"
+		            row-key="ID" 
+		            highlight-current-row="true"
+		          	:show-overflow-tooltip="true"
+		            border  @row-click="dianjianhandle"
+		            style="width:30%; height:50vh;"
+		            @row-dblclick="handleSelectClick"
+		            :row-class-name="rowClassName"
+		          >
+		            <el-table-column
+		              prop="日期"
+		              label="日期"
+		              width="160"
+		            />
+		            <el-table-column
+		              prop="机台编号"
+		              label="机台编号"
+		              width="90"
+		            />
+					<el-table-column
+					  prop="班组"
+					  label="班组"
+					  width="70"
+					/>
+					<el-table-column
+					  prop="工单编号A"
+					  label="工单编号A"
+					  width="95"
+					/>
+					<el-table-column
+					  prop="印件名称A"
+					  label="印件名称A"
+					  width="130"
+					/>
+					<el-table-column
+					  prop="印件工序A"
+					  label="印件工序A"
+					  width="150"
+					/>
+					<el-table-column
+					  prop="码包号A"
+					  label="码包号A"
+					  width="80"
+					/>
+					<el-table-column
+					  prop="工单编号B"
+					  label="工单编号B"
+					  width="100"
+					/>
+					<el-table-column
+					  prop="印件名称B"
+					  label="印件名称B"
+					  width="100"
+					/>
+					<el-table-column
+					  prop="印件工序B"
+					  label="印件工序B"
+					  width="150"
+					/>
+					<el-table-column
+					  prop="码包号B"
+					  label="码包号B"
+					  width="80"
+					/>
+					<el-table-column
+					  prop="清场项目A"
+					  label="菲林_标样_签样品_留样品"
+					  width="190"
+					/>
+					<el-table-column
+					  prop="清场项目B"
+					  label="版材_纸张_电化铝_油墨"
+					  width="190"
+					/>
+					<el-table-column
+					  prop="清场项目C"
+					  label="过版纸_废品_次品"
+					  width="170"
+					/>
+					<el-table-column
+					  prop="清场项目D"
+					  label="半成品_成品_零头"
+					  width="170"
+					/>
+					<el-table-column
+					  prop="清场项目E"
+					  label="操作台桌面_抽屉_地面"
+					  width="180"
+					/>
+					<el-table-column
+					  prop="机长"
+					  label="机长"
+					  width="80"
+					/>
+					<el-table-column
+					  prop="班长"
+					  label="带班长"
+					  width="80"
+					/>
+					<el-table-column
+					  prop="质量巡查员"
+					  label="质量巡查员"
+					  width="100"
+					/>
+					<el-table-column
+					  prop="创建时间"
+					  label="创建时间"
+					  width="120"
+					/>
+					<el-table-column
+					  prop="UNIQID"
+					  label="UNIQID"
+					  width="80"
+					/>
+		          </el-table>
+		        </el-tab-pane>
+		      </el-tabs>
+		    </div>
+		  </div>
+		</el-dialog>
+		
 		<Shebeizhuangtai
 		  v-if="dialogSbyxgl"
 		  v-model="dialogSbyxgl"
@@ -1203,7 +1351,9 @@ import {
   facilityPrintDetail,
   ProcessInspectionRecordsItem,
    MachineDetailList,
-   ComplaintRecord
+   ComplaintRecord,
+   remodelGetTab,
+   ModelChangeRecord
 } from '@/api/jixiaoguanli/jitairibaobiao'
 
 import {
@@ -1300,7 +1450,7 @@ const FacilityProduction = async () => {
 				   })
 		}
 		// console.log(formData.value.工单编号)
-	    FacilityTeam(JTMC)
+		
   }
   // getTableData()
 }
@@ -1317,12 +1467,15 @@ const FacilityWorklist = async () => {
 	if (res.code === 0) {
 	    selectData.value = res.data
 	}
+	console.log('22222222')
+	FacilityTeam(JTMC)
   }
 }
 //检验记录
 const InspectionRecord = async () => {
 	console.log(formData.value.班组)
-  const response = await inspectionRecord({machine:JTMC,Gd_gdbh:formData.value.工单编号,team:formData.value.班组});
+  // const response = await inspectionRecord({machine:JTMC,Gd_gdbh:formData.value.工单编号,team:formData.value.班组});
+  const response = await inspectionRecord({machine:'JY01#',Gd_gdbh:'2311114',team:'A班'});
   // const response = await inspectionRecord({machine:'JY01#',Gd_gdbh:'2312191',team:'A班'});
   console.log(response)
   if(response.code==0){
@@ -1369,7 +1522,8 @@ const FacilityDetail = async () => {
 	console.log(formData.value.工单编号)
 	console.log('123123')
 	console.log(formData.value.班组)
-  const response = await facilityDetail({ machine: JTMC, Gd_gdbh: formData.value.工单编号, team: formData.value.班组 });
+  // const response = await facilityDetail({ machine: JTMC, Gd_gdbh: formData.value.工单编号, team: formData.value.班组 });
+   const response = await facilityDetail({ machine: 'JY01#', Gd_gdbh: '2312191', team: 'A班' });
   // const response = await facilityDetail({ machine: JTMC, Gd_gdbh: '2311114', team:'A班' });
   if (response.code === 0) {
 	console.log('123123')
@@ -1624,18 +1778,23 @@ function oncomplaints() {
 }
 // 客诉记录表格填充
 const Complaints = async() => {
-	console.log(sbzyData[0].产品代号)
-	console.log(sbzyData[0].产品代号)
-	console.log(sbzyData[0].产品代号)
-    const res = await ComplaintRecord({productCode :cpcode.value})
-    if (res.code === 0) {
-		// console.log(res)
-		complaintsData.splice(0, complaintsData.length, ...res.data);
-		console.log(complaintsData);
-		console.log(complaintsData[0].产品编号)
-		selectedRowData.value=complaintsData[0]
-		console.log(selectedRowData)
-		complaintsShow.value=true
+	// console.log(sbzyData[0].产品代号)
+	// console.log(sbzyData[0].产品代号)
+	// console.log(sbzyData[0].产品代号)
+    // const res = await ComplaintRecord({productCode :cpcode.value})
+	const res = await ComplaintRecord({productCode :'100601011'})
+    if (res.code === 0) {			
+		if(res.data==null){
+			console.log('暂无客诉记录')
+		}else{
+			complaintsData.splice(0, complaintsData.length, ...res.data);
+			console.log(complaintsData);
+			console.log(complaintsData[0].产品编号)
+			selectedRowData.value=complaintsData[0]
+			console.log(selectedRowData)
+			complaintsShow.value=true
+		}
+		
     }
 }
 const selectedRowData = ref({
@@ -1646,6 +1805,54 @@ const complaintshandle = (val, row) => {
 	console.log(val)
 	selectedRowData.value=val
 };
+//换型清场
+const huanxingVisible = ref(false)
+const huanxingtreeData=ref([])
+const huanxingselectData = ref([])
+const huanxingstatus=ref(false)
+const activNames=ref('first')
+function onClear() {
+	huanxingVisible.value=true
+	 RemodelGetTab()
+}
+const RemodelGetTab = async() => {
+  const response = await remodelGetTab()
+  let arr=[]
+  if (response.code === 0) {
+	  for(let key in response.data){
+		  if(response.data[key][0]){
+			  let children =[]
+			  for (let i = 0; i < response.data[key].length; i++) {
+				  children.push({label:response.data[key][i],machine:key})
+			  }
+			  arr.push({
+				  label:key,
+				  children:children
+			  })
+			  console.log(response.data[key].length)
+		  }else{
+			 arr.push({label:key}) 
+		  }
+	  }
+	  huanxingtreeData.value=arr
+  }
+}
+
+const huanxingNodeClick = (node) => {
+  //存放当前节点的nodeId
+  if(node.machine){
+	  huanxingstatus.value=true
+	  modelChangeRecord(node.machine)
+  }else{
+	  console.log('2')
+  }
+}
+const modelChangeRecord = async (val) => {
+  const response = await ModelChangeRecord({machine:val});
+  if (response.code === 0) {
+	huanxingselectData.value=response.data
+  }
+}
 import { nextTick } from 'vue';
 //设备点检
 function ondianjian() {