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

src/api/productionManagement/productionMonitoring.js

@@ -2,7 +2,7 @@ import request from '@/axios';
 //列表接口
 export const getList = (current, size, params) => {
   return request({
-    url: '/blade-desk/order/assayContent/page',
+    url: '/blade-desk/workOrder/page',
     method: 'get',
     params: {
       ...params,
@@ -11,3 +11,5 @@ export const getList = (current, size, params) => {
     },
   });
 };
+
+// 

src/views/productionManagement/productionMonitoring.vue

@@ -93,36 +93,7 @@
         </el-dropdown>
       </template>
 
-      <!-- <template #tsName="{ row }">{{ row.makeTeam && row.makeTeam.tsName }}</template>
+      
-      <template #ppsName="{ row }">{{ row.procedureSet && row.procedureSet.ppsName }}</template>
-      <template #partCode="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.partCode }}</template>
-      <template #prodIdent="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.prodIdent }}</template>
-      <template #partName="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.partName }}</template>
-      <template #plate="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.plate }}</template>
-      <template #planEndDate="{ row }">
-        {{ Array.isArray(row.planEndDate) ? row.planEndDate.join(' ~ ') : row.planEndDate || '-' }}
-      </template>
-      <template #planTime="{ row }">
-        {{ Array.isArray(row.planTime) ? row.planTime.join(' ~ ') : row.planTime || '-' }}
-      </template>
-      <template #putStoreTime="{ row }">
-        {{
-          Array.isArray(row.putStoreTime) ? row.putStoreTime.join(' ~ ') : row.putStoreTime || '-'
-        }}
-      </template>
-      <template #productType="{ row }">{{
-        row.pjYieldOrder && row.pjYieldOrder.productType
-      }}</template>
-      <template #useDept="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.useDept }}</template>
-      <template #poArea="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.poArea }}</template>
-      <template #userName="{ row }">{{ row.dispatcher && row.dispatcher.userName }}</template>
-      <template #nextPpsName="{ row }">{{
-        row.nextProcedureSet && row.nextProcedureSet.ppsName
-      }}</template>
-      <template #nextTeamName="{ row }">{{ row.nextMakeTeam && row.nextMakeTeam.tsName }}</template>
-      <template #failureMan="{ row }">{{
-        row.pjYieldOrder && row.pjYieldOrder.failureMan && row.pjYieldOrder.failureMan.userName
-      }}</template> -->
     </avue-crud>
     <!-- 打印标签 -->
     <el-dialog append-to-body v-model="printDialog" title="打印标签">
@@ -268,7 +239,7 @@ export default {
         column: [
           {
             label: '主加工单位',
-            prop: 'tsName',
+            prop: 'mainTsName',
             search: true,
             sortable: true,
             overHidden: true,
@@ -279,7 +250,7 @@ export default {
 
           {
             label: '当前工序',
-            prop: 'ppsName',
+            prop: 'wpId',
             fixed: 'left',
             search: false,
             sortable: true,
@@ -288,7 +259,7 @@ export default {
           },
           {
             label: '下一工序',
-            prop: 'nextPpsName',
+            prop: 'ppsNameNext',
             search: false,
             sortable: true,
             overHidden: true,
@@ -296,7 +267,7 @@ export default {
           },
           {
             label: '订单状态',
-            prop: 'runStatusTitle',
+            prop: 'runStatus',
             type: 'select',
             search: true,
             sortable: true,
@@ -430,7 +401,7 @@ export default {
           },
           {
             label: '产品型号',
-            prop: 'productModel',
+            prop: 'productType',
             search: false,
             sortable: true,
             overHidden: true,
@@ -438,7 +409,7 @@ export default {
           },
           {
             label: '产品名称',
-            prop: 'false',
+            prop: 'partName',
             search: false,
             sortable: true,
             overHidden: true,
@@ -446,7 +417,7 @@ export default {
           },
           {
             label: 'MES流程卡号',
-            prop: 'false',
+            prop: 'mesCardNo',
             search: false,
             sortable: true,
             overHidden: true,
@@ -454,7 +425,7 @@ export default {
           },
           {
             label: '生产标识',
-            prop: 'prodIdent',
+            prop: 'productIdent',
             search: false,
             sortable: true,
             overHidden: true,
@@ -478,7 +449,7 @@ export default {
           },
           {
             label: '面积(dm²)',
-            prop: 'poArea',
+            prop: 'totalArea',
             search: false,
             sortable: true,
             overHidden: true,
@@ -486,7 +457,7 @@ export default {
           },
           {
             label: '单批次面积',
-            prop: 'batchArea',
+            prop: 'area',
             search: false,
             sortable: true,
             overHidden: true,
@@ -494,7 +465,7 @@ export default {
           },
           {
             label: '订单优先级',
-            prop: 'priorityTitle',
+            prop: 'priority',
             type: 'select',
             search: true,
             sortable: true,
@@ -550,7 +521,7 @@ export default {
           },
           {
             label: '调度员',
-            prop: 'userName',
+            prop: 'dispatcher',
             search: true,
             sortable: true,
             overHidden: true,
@@ -566,7 +537,7 @@ export default {
           },
           {
             label: '计划下达时间',
-            prop: 'planTime',
+            prop: 'sendDownTime',
             sortable: true,
             filter: true,
             selectWidth: 150,
@@ -657,7 +628,7 @@ export default {
           },
           {
             label: '试验数量',
-            prop: 'testQuantity',
+            prop: 'testQty',
             search: false,
             sortable: true,
             overHidden: true,
@@ -665,7 +636,7 @@ export default {
           },
           {
             label: '报废数量',
-            prop: 'scrapQuantity',
+            prop: 'scrapQty',
             search: false,
             sortable: true,
             overHidden: true,