Merge branch 'dev-scheduling' of http://42.192.7.176:3000/suojin/jonhon-mes-web into dev-scheduling

src/views/productionManagement/blbWorkOrder/components/glass.vue

@@ -333,6 +333,17 @@ export default {
             sortable: true,
             overHidden: true,
             width: 200,
+          },
+           {
+            label: '订单优先级',
+            prop: 'priorityName',
+            type: 'select',
+            search: false,
+            sortable: true,
+            overHidden: true,
+            width: 200,
+            searchLabelWidth: 100,
+          
           },
           {
             label: '订单优先级',
@@ -342,6 +353,8 @@ export default {
             sortable: true,
             overHidden: true,
             width: 200,
+            searchLabelWidth: 100,
+            hide:true,
             dicUrl: '/blade-system/dict/dictionary?code=orderPriority',
             props: {
               label: 'dictValue',

src/views/productionManagement/blbWorkOrder/components/others.vue

@@ -334,6 +334,17 @@ export default {
             overHidden: true,
             width: 200,
           },
+          {
+            label: '订单优先级',
+            prop: 'priorityName',
+            type: 'select',
+            search: false,
+            sortable: true,
+            overHidden: true,
+            width: 200,
+            searchLabelWidth: 100,
+          
+          },
           {
             label: '订单优先级',
             prop: 'priority',
@@ -342,6 +353,8 @@ export default {
             sortable: true,
             overHidden: true,
             width: 200,
+            searchLabelWidth: 100,
+            hide:true,
             dicUrl: '/blade-system/dict/dictionary?code=orderPriority',
             props: {
               label: 'dictValue',

src/views/productionManagement/productionMonitoring.vue

@@ -410,6 +410,17 @@ export default {
             overHidden: true,
             width: 200,
           },
+          {
+            label: '订单优先级',
+            prop: 'priorityName',
+            type: 'select',
+            search: false,
+            sortable: true,
+            overHidden: true,
+            width: 200,
+            searchLabelWidth: 100,
+          
+          },
           {
             label: '订单优先级',
             prop: 'priority',
@@ -419,6 +430,7 @@ export default {
             overHidden: true,
             width: 200,
             searchLabelWidth: 100,
+            hide:true,
             dicUrl: '/blade-system/dict/dictionary?code=orderPriority',
             props: {
               label: 'dictValue',

src/views/productionManagement/sinTerWorkOrder/index.vue

@@ -338,6 +338,17 @@ export default {
             sortable: true,
             overHidden: true,
             width: 200,
+          },
+           {
+            label: '订单优先级',
+            prop: 'priorityName',
+            type: 'select',
+            search: false,
+            sortable: true,
+            overHidden: true,
+            width: 200,
+            searchLabelWidth: 100,
+          
           },
           {
             label: '订单优先级',
@@ -347,6 +358,8 @@ export default {
             sortable: true,
             overHidden: true,
             width: 200,
+            searchLabelWidth: 100,
+            hide:true,
             dicUrl: '/blade-system/dict/dictionary?code=orderPriority',
             props: {
               label: 'dictValue',

src/views/productionManagement/sjKitPreparation/index.vue

@@ -17,13 +17,30 @@
     >
       <template #menu-left> </template>
       <template #menu-right> </template>
-      <template #menu="{ row }">
+      <template #menu="scope">
+        <!-- 按钮展示规则
+            完成：sjMoldPreparation字段是空或者不等于2
+            发送：sjKitPreparation字段是空或者不等于2
+            车间订单生成：sjKitPreparation字段等于2
+         -->
         <!-- 石墨模准备完成 -->
-        <el-button v-if="row.sjMoldPreparation==''||row.sjMoldPreparation==null||row.sjMoldPreparation!=2" type="text" @click="moldComplete(scope.row.yoId)">完成</el-button>
+        <el-button
+          v-if="scope.row.sjMoldPreparation != 2"
+          type="text"
+          @click="moldComplete(scope.row.yoId)"
+          >完成</el-button
+        >
         <!-- 齐套流转完成 -->
-        <el-button v-if="row.sjKitPreparation==''||row.sjKitPreparation==null||row.sjKitPreparation!=2" type="text" @click="sendKit(scope.row.yoId)">发送</el-button>
+        <el-button
+          v-if="scope.row.sjKitPreparation != 2"
+          type="text"
+          @click="sendKit(scope.row.yoId)"
+          >发送</el-button
+        >
         <!-- 车间订单生成 -->
-        <el-button v-if="row.sjKitPreparation==2" type="text" @click="orderGen(scope.row.yoId)">车间订单生成</el-button>
+        <el-button v-if="row.sjKitPreparation == 2" type="text" @click="orderGen(scope.row.yoId)"
+          >车间订单生成</el-button
+        >
       </template>
 
       <template #heatTreat="scope">
@@ -173,6 +190,7 @@ export default {
             sortable: true,
             width: 150,
           },
+          
           {
             label: '使用部门',
             prop: 'useDept',