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

src/api/logisticsManagement/logisticsDistribution.js

@@ -73,3 +73,13 @@ export const getStationRegionList = (params) => {
   });
 };
 
+
+// 获取配送任务详情数据  
+
+export const taskDetails = (data) => {
+  return request({
+    url: '/blade-desk/order/task-details',
+    method: 'post',
+    data: data,
+  });
+};

src/views/logisticsManagement/components/detailsLogisticsDialog.vue

@@ -0,0 +1,68 @@
+<template>
+  <el-dialog title="详情" append-to-body :modelValue="openShow" width="70%" @close="closeDialog">
+    <el-descriptions title="物料记录"></el-descriptions>
+    <el-table :data="detailsInfo.boxbarcodeDetailsVO.yieldOrderList|| []" style="width: 100%">
+      <el-table-column type="index" width="50" label="序号"> </el-table-column>
+      <el-table-column prop="cardNo" label="流程卡号" show-overflow-tooltip> </el-table-column>
+      <el-table-column prop="yoCode" label="生产单号" show-overflow-tooltip> </el-table-column>
+      <el-table-column prop="partCode" label="零件号" show-overflow-tooltip> </el-table-column>
+      <el-table-column prop="partName" label="零件名称" show-overflow-tooltip> </el-table-column>
+      <el-table-column prop="actualWeighing" label="重量">
+          <template #default="scope">{{ scope.row.actualWeighing ? Number(scope.row.actualWeighing).toFixed(2)+'g' : '0g' }}</template>
+      </el-table-column>
+    </el-table>
+    <el-descriptions title="执行记录" style="margin-top: 10px;"></el-descriptions>
+    <el-table :data="detailsInfo.taskExecuteRecordList|| []" style="width: 100%">
+      <el-table-column type="index" width="50" label="序号"> </el-table-column>
+      <el-table-column prop="startPos" label="开始位置" show-overflow-tooltip> </el-table-column>
+      <el-table-column prop="endPos" label="结束位置" show-overflow-tooltip> </el-table-column>
+      <el-table-column prop="method" label="执行状态" show-overflow-tooltip> </el-table-column>
+      <el-table-column prop="createTime" label="执行时间" show-overflow-tooltip> </el-table-column>
+    </el-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="closeDialog">取 消</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+<script>
+import { taskDetails } from '@/api/logisticsManagement/logisticsDistribution';
+
+export default {
+  props: {
+    showDialog: {
+      type: Boolean,
+      default: false,
+    },
+    rowItem: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  data() {
+    return {
+      openShow: false,
+      detailsInfo: {},
+    };
+  },
+  mounted() {
+    this.openShow = this.showDialog;
+    this.detailsFn();
+  },
+  methods: {
+    async detailsFn() {
+      await taskDetails({ boxBarcode: this.rowItem.boxBarcode, taskId: this.rowItem.id }).then(
+        res => {
+          this.detailsInfo = res.data.data;
+        }
+      );
+    },
+    closeDialog() {
+      this.openShow = false;
+      this.$emit('closeDialog');
+    },
+  },
+};
+</script>
+<style lang="scss" scoped></style>

src/views/logisticsManagement/logisticsDistribution.vue

@@ -22,11 +22,9 @@
         <!-- <el-button type="primary" @click="returnFn">退回</el-button> -->
       </template>
       <template #menu-right> </template>
-      <!-- <template #menu="{ row }">
+      <template #menu="{ row }">
-        <el-button type="text" v-if="row.status == '1' || row.status == '2'" @click="receiveFn(row)"
+        <el-button type="text" @click="detailsFn(row)">详情</el-button>
-          >接收</el-button
+      </template>
-        >
-      </template> -->
     </avue-crud>
     <!-- 新增 -->
     <addLogisticsDialog
@@ -42,23 +40,34 @@
       @closeDialog="closeDialog"
     ></returnDialog>
     <!-- 接收 -->
-     <receiveDialog v-if="showReceiveDialog" :showDialog="showReceiveDialog" @closeDialog="closeDialog"></receiveDialog>
+    <receiveDialog
+      v-if="showReceiveDialog"
+      :showDialog="showReceiveDialog"
+      @closeDialog="closeDialog"
+    ></receiveDialog>
+
+    <!-- 详情 -->
+     <detailsLogisticsDialog v-if="detailsLogisticsShow" :showDialog="detailsLogisticsShow" @closeDialog="closeDialog" :rowItem="rowItem"></detailsLogisticsDialog>
   </basic-container>
 </template>
 
 <script>
 import addLogisticsDialog from './components/addLogisticsDialog.vue';
 import returnDialog from './components/returnDialog.vue';
-import receiveDialog from './components/receiveDialog.vue'
+import receiveDialog from './components/receiveDialog.vue';
 import { getList } from '@/api/logisticsManagement/logisticsDistribution';
+
+import detailsLogisticsDialog from './components/detailsLogisticsDialog.vue';
 export default {
   components: {
     addLogisticsDialog,
     returnDialog,
-    receiveDialog
+    receiveDialog,
+    detailsLogisticsDialog
   },
   data() {
     return {
+      detailsLogisticsShow:false,
       showReceiveDialog: false,
       showReturnDialog: false,
       showAddDialogd: false,
@@ -109,61 +118,146 @@ export default {
         searchLabelPosition: 'left',
         searchGutter: 24,
         searchSpan: 6,
-        menuAlign: 'left',
+        menuAlign: 'center',
         gridBtn: false,
         searchMenuPosition: 'right',
         align: 'center',
-        menu: false,
         column: [
           {
-            label: '箱条码',
+            label: '任务编号',
-            prop: 'boxBarcode',
+            prop: 'id',
+            search: false,
+            sortable: true,
+            span: 12,
+            width: 160,
+            searchOrder:18,
+          },
+           {
+            label: '任务编号',
+            prop: 'taskId',
             search: true,
             sortable: true,
             span: 12,
+            width: 160,
+            searchOrder:18,
+            hide: true,
           },
-          // {
-          //   label: '站点名称',
-          //   prop: 'stationId',
-          //   search: true,
-          //   sortable: true,
-          //   span: 12,
-          // },
           {
-            label: '作业中心',
+            label: '起点-作业中心',
-            prop: 'wcName',
+            prop: 'startWcName',
             search: false,
             sortable: true,
             span: 12,
+            width: 120,
+            
           },
           {
-            label: '作业中心',
+            label: '起点-区域',
-            prop: 'wcId',
+            prop: 'startStationRegion',
+            search: true,
+            sortable: true,
+            span: 12,
+            width: 120,
+            searchOrder:17,
+          },
+          {
+            label: '起点-站点',
+            prop: 'startStationCode',
+            search: true,
+            sortable: true,
+            span: 12,
+            width: 120,
+            searchOrder:16,
+          },
+          {
+            label: '终点-作业中心',
+            prop: 'wcName',
             search: false,
             sortable: true,
             span: 12,
-            hide: true,
+            width: 120,
-            type: 'select',
-            filterable: true,
-            dicUrl: '/blade-desk/order/bs-list',
-            props: {
-              label: 'wcName',
-              value: 'id',
-            },
           },
-           {
+          {
-            label: '区域',
+            label: '终点-区域',
             prop: 'stationRegion',
             search: false,
             sortable: true,
             span: 12,
+            width: 120,
+            searchOrder:15,
           },
+          {
+            label: '终点-区域',
+            prop: 'endStationRegion',
+            search: true,
+            sortable: true,
+            span: 12,
+            width: 120,
+            hide: true,
+            searchOrder:15,
+          },
+          {
+            label: '终点-站点',
+            prop: 'endStationCode',
+            search: true,
+            sortable: true,
+            span: 12,
+            width: 120,
+            searchOrder:14,
+          },
+          
+          {
+            label: '箱条码',
+            prop: 'boxBarcode',
+            search: true,
+            sortable: true,
+            span: 12,
+            width: 120,
+            searchOrder:20,
+          },
+          // {
+          //   label: '站点名称',
+          //   prop: 'stationId',
+          //   search: true,
+          //   sortable: true,
+          //   span: 12,
+          // },
+          // {
+          //   label: '作业中心',
+          //   prop: 'wcName',
+          //   search: false,
+          //   sortable: true,
+          //   span: 12,
+          // },
+          // {
+          //   label: '作业中心',
+          //   prop: 'wcId',
+          //   search: false,
+          //   sortable: true,
+          //   span: 12,
+          //   hide: true,
+          //   type: 'select',
+          //   filterable: true,
+          //   dicUrl: '/blade-desk/order/bs-list',
+          //   props: {
+          //     label: 'wcName',
+          //     value: 'id',
+          //   },
+          // },
+          //  {
+          //   label: '区域',
+          //   prop: 'stationRegion',
+          //   search: false,
+          //   sortable: true,
+          //   span: 12,
+          // },
           {
             label: '状态',
             prop: 'statusDesc',
             search: false,
             sortable: true,
             span: 12,
+            width: 120,
             // type: 'select',
             // dicData: [
             //   { label: '起点位置', value: 0 },
@@ -179,11 +273,19 @@ export default {
             // ],
           },
           {
-            label: '创建时间',
+            label: '发起人',
+            prop: 'createUserStr',
+            search: false,
+            sortable: true,
+            span: 12,
+          },
+          {
+            label: '发起时间',
             prop: 'createTime',
             search: false,
             sortable: true,
             span: 12,
+            width: 120,
           },
           {
             label: '时间范围',
@@ -203,6 +305,7 @@ export default {
             endPlaceholder: '结束日期',
             rangeSeparator: '-',
             searchRange: true,
+            searchOrder:19,
           },
         ],
       },
@@ -211,7 +314,7 @@ export default {
     };
   },
   methods: {
-    receiveFn(){
+    receiveFn() {
       this.showReceiveDialog = true;
     },
     returnFn() {
@@ -220,12 +323,17 @@ export default {
     },
     addFn() {
       // this.showAddDialogd = true;
-       this.showReturnDialog = true;
+      this.showReturnDialog = true;
+    },
+    detailsFn(row){
+      this.rowItem = row
+      this.detailsLogisticsShow = true
     },
     closeDialog() {
       this.showAddDialogd = false;
       this.showReturnDialog = false;
       this.showReceiveDialog = false;
+      this.detailsLogisticsShow = false
       this.onLoad(this.page, this.query);
     },
     rowSave(row, done, loading) {