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

src/views/logisticsManagement/components/detailsLogisticsDialog.vue

@@ -1,7 +1,7 @@
 <template>
   <el-dialog title="详情" append-to-body :modelValue="openShow" width="70%" @close="closeDialog" :loading="detailsLoading">
     <el-descriptions title="物料记录"></el-descriptions>
-    <el-table :data="yieldOrderList|| []" style="width: 100%">
+    <el-table :data="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>
@@ -12,7 +12,7 @@
       </el-table-column>
     </el-table>
     <el-descriptions title="执行记录" style="margin-top: 10px;"></el-descriptions>
-    <el-table :data="detailsInfo.taskExecuteRecordList|| []" style="width: 100%">
+    <el-table :data="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>
@@ -45,6 +45,7 @@ export default {
       openShow: false,
       detailsInfo: {},
       yieldOrderList:[],
+      taskExecuteRecordList:[],
       detailsLoading:true
     };
   },
@@ -58,7 +59,8 @@ export default {
       await taskDetails({ boxBarcode: this.rowItem.boxBarcode, taskId: this.rowItem.id }).then(
         res => {
           this.detailsLoading = false
-          this.yieldOrderList = res.data.data.boxbarcodeDetailsVO.yieldOrderList;
+          this.yieldOrderList = res.data.data.boxbarcodeDetailsVO!=null?res.data.data.boxbarcodeDetailsVO.yieldOrderList:[]
+          this.taskExecuteRecordList = res.data.data.taskExecuteRecordList!=null?res.data.data.taskExecuteRecordList:[]
           this.detailsInfo = res.data.data;
         }
       ).catch(err => {

src/views/logisticsManagement/logisticsDistribution.vue

@@ -144,8 +144,9 @@ export default {
             sortable: true,
             span: 12,
             width: 160,
-            searchOrder: 18,
+            
             hide: true,
+             searchOrder: 20,
           },
           {
             label: '起点-作业中心',
@@ -222,6 +223,7 @@ export default {
             span: 12,
             width: 120,
             searchOrder: 14,
+            // searchOrder: 19,
           },
 
           {
@@ -231,7 +233,7 @@ export default {
             sortable: true,
             span: 12,
             width: 120,
-            searchOrder: 20,
+            searchOrder: 18,
           },
           // {
           //   label: '站点名称',
@@ -323,7 +325,7 @@ export default {
             endPlaceholder: '结束日期',
             rangeSeparator: '-',
             searchRange: true,
-            searchOrder: 19,
+            searchOrder: 13,
           },
         ],
       },

src/views/productionManagement/reworkOrder/index.vue

@@ -28,9 +28,9 @@
         <el-button type="text" @click="finishData(row)" v-if="row.seqno === 1">完成</el-button>
       </template>
       <template #redono="scope">
-        <el-button type="text" @dblclick="detailsFn(scope.row)">
+        <span class="partSel" @dblclick="detailsFn(scope.row)">
           {{ scope.row.redono }}
-        </el-button>
+        </span>
       </template>
     </avue-crud>
     <!-- 改数接收 -->
@@ -332,11 +332,11 @@ export default {
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
-      // this.onLoad(this.page, this.query);
+      this.onLoad(this.page, this.query);
     },
     sizeChange(pageSize) {
       this.page.pageSize = pageSize;
-      // this.onLoad(this.page, this.query);
+      this.onLoad(this.page, this.query);
     },
     refreshChange() {
       this.onLoad(this.page, this.query);
@@ -365,4 +365,10 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.partSel{
+  cursor: pointer;
+  color:#284c89 !important;
+  font-weight: 600;
+}
+</style>

src/views/productionManagement/reworkPlan/index.vue

@@ -24,14 +24,19 @@
         </el-button>
       </template> -->
       <template #redono="scope">
-        <el-button type="text" @dblclick="detailsFn(scope.row)">
+       <span class="partSel" @dblclick="detailsFn(scope.row)">
           {{ scope.row.redono }}
-        </el-button>
+        </span>
       </template>
     </avue-crud>
 
     <!-- 返工订单详情 -->
-     <reworkDetails v-if="detailsShow" :showDialog="detailsShow" @closeDialog="closeDialog" :rowItem="rowItem"></reworkDetails>
+    <reworkDetails
+      v-if="detailsShow"
+      :showDialog="detailsShow"
+      @closeDialog="closeDialog"
+      :rowItem="rowItem"
+    ></reworkDetails>
   </basic-container>
 </template>
 
@@ -39,11 +44,11 @@
 import { getList } from '@/api/productionManagement/reworkPlan.js';
 import reworkDetails from '../reworkOrder/components/reworkDetails.vue';
 export default {
-  components: {reworkDetails},
+  components: { reworkDetails },
   data() {
     return {
-      detailsShow:false,
-      rowItem:{},
+      detailsShow: false,
+      rowItem: {},
       form: {},
       selectionList: [],
       query: {},
@@ -181,13 +186,13 @@ export default {
   },
   methods: {
     // 跳转详情
-    detailsFn(row){
-      this.detailsShow = true
-      this.rowItem = row
+    detailsFn(row) {
+      this.detailsShow = true;
+      this.rowItem = row;
     },
-    closeDialog(){
-      this.detailsShow = false
-      this.onLoad(this.page,this.query)
+    closeDialog() {
+      this.detailsShow = false;
+      this.onLoad(this.page, this.query);
     },
     rowSave(row, done, loading) {
       // addPersonAbility(row).then(
@@ -278,17 +283,25 @@ export default {
 
     onLoad(page, params = {}) {
       this.loading = true;
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        this.data = res.data.data.records;
-        this.loading = false;
-        this.page.total = res.data.data.total;
-        // this.selectionClear();
-      }).catch(() => {
-        this.loading = false;
-      });
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query))
+        .then(res => {
+          this.data = res.data.data.records;
+          this.loading = false;
+          this.page.total = res.data.data.total;
+          // this.selectionClear();
+        })
+        .catch(() => {
+          this.loading = false;
+        });
     },
   },
   mounted() {},
 };
 </script>
-d
+<style lang="scss" scoped>
+.partSel {
+  cursor: pointer;
+  color: #284c89 !important;
+  font-weight: 600;
+}
+</style>