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

src/view/yunyin/shengchanguanli/gongdanshengchan.vue

@@ -257,7 +257,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" :sortable="item.sortable"  />
+                  <el-table-column :align="item.align" :label="item.title" :fixed="item.fixed"   :prop="item.prop" :width="item.width" :sortable="item.sortable"  />
                 </template>
               </el-table>
               <!-- 分页 -->
@@ -332,7 +332,7 @@
                         :cell-class-name="pczc_planUsageCellClass"
                         style="width: 100%;height: 42vh" 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" :sortable="item.sortable" />
+                  <el-table-column :align="item.align" :label="item.title" :fixed="item.fixed"  :prop="item.prop" :width="item.width" :sortable="item.sortable" />
                 </template>
               </el-table>
             </div>
@@ -347,7 +347,7 @@
                 <!-- 排程列表-->
                 <el-table-column type="selection" width="30" />
                 <template v-for="item in [
-                  { align:'left', title: '工单编号', prop: '工单编号', width: 110  , sortable: 'sortable', },
+                  { align:'left', title: '工单编号', prop: '工单编号', width: 110  , sortable: 'sortable',fixed:'fixed',},
                   { align:'left', title: '销售订单号', prop: '销售订单号', width: 200  , sortable: 'sortable', },
                   { align:'left', title: '印件名称', prop: '印件名称', width: 320  , sortable: 'sortable', },
                   { align:'left', title: '印件工序及名称', prop: '印件工序及名称', width: 200  , sortable: 'sortable', },
@@ -365,7 +365,7 @@
                   { align:'left', title: '印件号', prop: 'yjno', width: 110  , sortable: 'sortable', },
                   { align:'left', title: '工序号', prop: 'gxh', width: 110  , sortable: 'sortable', },
               ]">
-                  <el-table-column :align="item.align" :label="item.title" :prop="item.prop" :width="item.width" :sortable="item.sortable" />
+                  <el-table-column :align="item.align" :label="item.title"  :fixed="item.fixed" :prop="item.prop" :width="item.width" :sortable="item.sortable" />
                 </template>
               </el-table>
               <!-- 制程列表-->
@@ -376,7 +376,7 @@
                         style="width: 100%;height: 49vh;margin-top: 10px" border tooltip-effect="dark" :data="chejianfuData" row-key="ID" @selection-change="ZP_handleChange">
                 <el-table-column type="selection" width="30" />
                 <template v-for="item in [
-                  { align:'left', title: '工单编号', prop: '工单编号', width: 110  , sortable: 'sortable', },
+                  { align:'left', title: '工单编号', prop: '工单编号', width: 110  , sortable: 'sortable',fixed:'fixed',},
                   { align:'left', title: '销售订单号', prop: '销售订单号', width: 200  , sortable: 'sortable', },
                   { align:'left', title: '印件名称', prop: '印件名称', width: 320  , sortable: 'sortable', },
                   { align:'left', title: '印件工序及名称', prop: '印件工序及名称', width: 200  , sortable: 'sortable', },
@@ -404,7 +404,7 @@
                   { align:'left', title: '印件号', prop: 'yjno', width: 110  , sortable: 'sortable', },
                   { align:'left', title: '工序号', prop: 'gxh', width: 110  , sortable: 'sortable', },
               ]">
-                  <el-table-column :align="item.align" :label="item.title" :prop="item.prop" :width="item.width" :sortable="item.sortable" />
+                  <el-table-column :align="item.align" :label="item.title" :fixed="item.fixed" :prop="item.prop" :width="item.width" :sortable="item.sortable" />
                 </template>
               </el-table>
             </div>
@@ -518,9 +518,9 @@ const tableFields = ref({
   ],
   "排程中": [
     // { title: '最早开工时间', prop: '最早开工时间', width: 120, align:'left', },
-    { title: '工单编号', prop: '工单编号', width: 110, align:'left',  sortable: 'sortable', },
-    { title: '产品代号', prop: '产品代号', width: 110, align:'left',  sortable: 'sortable', },
-    { title: '产品名称', prop: '产品名称', width: 340, align:'left',  sortable: 'sortable', },
+    { title: '工单编号', prop: '工单编号', width: 110, align:'left',  sortable: 'sortable',fixed:'fixed'},
+    { title: '产品代号', prop: '产品代号', width: 110, align:'left',  sortable: 'sortable',fixed:'fixed'},
+    { title: '产品名称', prop: '产品名称', width: 340, align:'left',  sortable: 'sortable',fixed:'fixed'},
     { title: '接单日期', prop: '接单日期', width: 110, align:'left',  sortable: 'sortable', },
     { title: '交货日期', prop: '交货日期', width: 110, align:'left',  sortable: 'sortable', },
     { title: '订单数量', prop: '订单数量', width: 110, align:'left',  sortable: 'sortable', },
@@ -535,9 +535,9 @@ const tableFields = ref({
   ],
   "制程中": [
     // { title: '最早开工时间', prop: '最早开工时间', width: 120, align:'left',  sortable: 'sortable', },
-    { title: '工单编号', prop: '工单编号', width: 110, align:'left',  sortable: 'sortable', },
-    { title: '产品代号', prop: '产品代号', width: 110, align:'left',  sortable: 'sortable', },
-    { title: '产品名称', prop: '产品名称', width: 340, align:'left',  sortable: 'sortable', },
+    { title: '工单编号', prop: '工单编号', width: 110, align:'left',  sortable: 'sortable',fixed:'fixed'},
+    { title: '产品代号', prop: '产品代号', width: 110, align:'left',  sortable: 'sortable',fixed:'fixed'},
+    { title: '产品名称', prop: '产品名称', width: 340, align:'left',  sortable: 'sortable',fixed:'fixed'},
     { title: '接单日期', prop: '接单日期', width: 110, align:'left',  sortable: 'sortable', },
     { title: '交货日期', prop: '交货日期', width: 110, align:'left',  sortable: 'sortable', },
     { title: '订单数量', prop: '订单数量', width: 110, align:'left',  sortable: 'sortable', },
@@ -569,7 +569,7 @@ const tableFields = ref({
 //排程中、制程中下方表格列表
 const bottomTableF = ref({
   "排程中": [
-    { title:'工单编号', prop: '工单编号', width: 110, align:'left',  sortable: 'sortable', },
+    { title:'工单编号', prop: '工单编号', width: 110, align:'left',  sortable: 'sortable',fixed:'fixed'},
     { title:'印件工序及名称', prop: '印件工序及名称', width: 160, align:'left',  sortable: 'sortable', },
     { title:'机组', prop: '机组', width: 120, align:'left',  sortable: 'sortable', },
     { title:'设备编号', prop: '设备编号', width: 120, align:'left',  sortable: 'sortable', },
@@ -590,7 +590,7 @@ const bottomTableF = ref({
     { title:'UNIQID', prop: 'UNIQID', width: 120, align:'left',  sortable: 'sortable', },
   ],
   "制程中": [
-    { title:'工单编号', prop: '工单编号', width: 110, align:'left',  sortable: 'sortable', },
+    { title:'工单编号', prop: '工单编号', width: 110, align:'left',  sortable: 'sortable',fixed:'fixed'},
     { title:'印件工序及名称', prop: '印件工序及名称', width: 160, align:'left',  sortable: 'sortable', },
     { title:'机组', prop: '机组', width: 120, align:'left',  sortable: 'sortable', },
     { title:'设备编号', prop: '设备编号', width: 120, align:'left',  sortable: 'sortable', },

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -229,10 +229,10 @@
                                   style="width: 100%;height: 400px" border tooltip-effect="dark" :data="CLMXData" row-key="ID" @selection-change="dbclmxSelectionChange"
                                   >
                           <el-table-column type="selection" width="55" />
-                          <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 fixed align="left" sortable label="生产时段" prop="生产时间段"  width="180"/>
+                          <el-table-column fixed align="left" sortable label="工单编号" prop="工单编号" width="90" />
+                          <el-table-column fixed align="left" sortable label="产品名称" prop="产品名称" width="150" />
+                          <el-table-column fixed 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" />
@@ -969,15 +969,15 @@
 					                style="width: 100%;height: 70vh" border tooltip-effect="dark" :data="gytableData" row-key="ID" >
 					        <el-table-column type="selection" width="55" />
 					        <!-- <el-table-column align="left" label="选择" prop="工单编号"  width="100"/> -->
-					        <el-table-column align="left" label="产品名称" prop="产品名称"  width="200"/>
-					        <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="70"/>
+					        <el-table-column fixed align="left" label="产品名称" prop="产品名称"  width="200"/>
+					        <el-table-column fixed align="left" label="工序" prop="工序"  width="100"/>
+							<el-table-column fixed 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" 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="85"/>
+							<el-table-column align="left" label="备注" prop="备注"  width="100"/>
 					        <el-table-column align="left" label="组员1" prop="组员1" width="170" />
 					        <el-table-column align="left" label="组员2" prop="组员2" width="170" />
 					        <el-table-column align="left" label="组员3" prop="组员3" width="170" />
@@ -3992,7 +3992,8 @@ const _Gd_gdbh=ref()
 function getUid(row, column, event) {
  console.log(row)
  uid.value=row['UniqId']
- _Gd_gdbh.value=row['工单编号']
+ _Gd_gdbh.value=row['工单编号']
+  _gdbhlist.value=row['工单编号']
  console.log("UniqId"+uid.value)
 }
 //获取详细信息