From 4876dc4b813ee883e4fcc271f75c65a2d8e12fc4 Mon Sep 17 00:00:00 2001
From: zhc077 <565291854>
Date: Tue, 14 Feb 2023 18:00:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8A=E6=8C=82=E7=AE=A1=E7=90=86-=E5=90=8A?=
 =?UTF-8?q?=E6=8C=82=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF-=E7=AE=A1?=
 =?UTF-8?q?=E9=9D=A2=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96=202.13?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/hanger/HangRecordList.vue       | 10 +++++
 .../src/views/hanger/HangerManage.vue         | 37 ++++++++++---------
 .../views/productplan/ProductplanManage.vue   |  1 +
 .../modules/hanger/entity/HangRecord.java     |  4 +-
 .../service/impl/HangRecordServiceImpl.java   |  1 +
 5 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/hanger/HangRecordList.vue b/ant-design-vue-jeecg/src/views/hanger/HangRecordList.vue
index 41d12dc2..8976d2d3 100644
--- a/ant-design-vue-jeecg/src/views/hanger/HangRecordList.vue
+++ b/ant-design-vue-jeecg/src/views/hanger/HangRecordList.vue
@@ -106,6 +106,11 @@ export default {
             return parseInt(index) + 1;
           }
         },
+        {
+          title: '工单编号',
+          align: "center",
+          dataIndex: 'orderCode'
+        },
         {
           title: '吊挂编号',
           align: "center",
@@ -131,6 +136,11 @@ export default {
           align: "center",
           dataIndex: 'duration'
         },
+        {
+          title: '创建时间',
+          align: "center",
+          dataIndex: 'createTime'
+        },
         {
           title: '状态',
           align: "center",
diff --git a/ant-design-vue-jeecg/src/views/hanger/HangerManage.vue b/ant-design-vue-jeecg/src/views/hanger/HangerManage.vue
index 1331b845..7a8cb1d3 100644
--- a/ant-design-vue-jeecg/src/views/hanger/HangerManage.vue
+++ b/ant-design-vue-jeecg/src/views/hanger/HangerManage.vue
@@ -6,6 +6,7 @@
     <div>
       <j-vxe-table
         ref="xTable"
+        bordered
         toolbar
         :toolbarConfig="toolbarConfig"
         row-number
@@ -53,12 +54,12 @@ export default {
         {
           title: '车间',
           key: 'workshopName',
-          width: '220px',
+          // width: '220px',
         },
         {
           title: '吊挂编号',
           key: 'code',
-          width: '220px',
+          // width: '220px',
         },
         {
           title: '工站数量',
@@ -69,7 +70,7 @@ export default {
           title: '工站编号',
           key: 'point',
           type: JVXETypes.input,
-          width: '220px',
+          // width: '220px',
           /*validateRules: [
             {
               required: true, // 必填
@@ -144,23 +145,25 @@ export default {
   },
   created() {
     this.loadParameter();
-    // this.getStationList();
   },
-  methods: {
 
-    async getStationList() {
-      const {data: res} = await this.$axios.get(this.url.getStationList, {params: {id: this.id}})
-      if (res.success) {
-        // this.dataSource = res.result.records || res.result;
-        this.stationIdList = JSON.stringify(res.result);
-        console.log("the getStationList=" + this.stationIdList)
-        console.log("this.columns[6].options------------:" + this.columns[6].options);
-        this.columns[6].options = this.stationIdList;
-      } else {
-        this.$message.warning(res.message)
-      }
-    },
+/*  updated() {
+    console.log("beforeUpdate-------",JSON.stringify(this.stationIdList));
+    console.log("this.$refs.vxe.columns[5].options-------",this.$refs.xTable.columns);
+    // this.$data.columns[5].options = this.stationIdList;
+    if (this.$refs.xTable.columns.concat('stationName2')) {
+    // this.$refs.xTable.columns[5].options = this.stationIdList
+      console.log("concat")
+      this.$refs.xTable.columns[5].options= this.stationIdList;
+      this.$refs.xTable.columns[4].options= this.stationIdList;
+    }
+    // this.$forceUpdate();
+    // this.$refs.xTable.columns[6].options = this.stationIdList
+    // this.$refs.xTable.columns[7].options = this.stationIdList
+  },*/
 
+
+  methods: {
     // 【整体保存】点击保存按钮时触发的事件
     handleTableSave({$table, target}) {
       console.log("生产计划工序保存开始-----------------")
diff --git a/ant-design-vue-jeecg/src/views/productplan/ProductplanManage.vue b/ant-design-vue-jeecg/src/views/productplan/ProductplanManage.vue
index e92dcd14..77870d39 100644
--- a/ant-design-vue-jeecg/src/views/productplan/ProductplanManage.vue
+++ b/ant-design-vue-jeecg/src/views/productplan/ProductplanManage.vue
@@ -33,6 +33,7 @@
       <j-vxe-table
         ref="xTable"
         toolbar
+        bordered
         :toolbarConfig="toolbarConfig"
         row-number
         row-selection
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/entity/HangRecord.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/entity/HangRecord.java
index f4eea4fc..1b0e4d66 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/entity/HangRecord.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/entity/HangRecord.java
@@ -100,12 +100,12 @@ public class HangRecord implements Serializable {
      */
     @Excel(name = "时长", width = 15)
     @ApiModelProperty(value = "时长")
-    private Integer duration;
+    private String duration;
     /**
      * 状态
      */
     @Excel(name = "状态", width = 15)
     @ApiModelProperty(value = "状态")
     @Dict(dicCode = "hang_record_status")
-    private Integer status;
+    private String status;
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/impl/HangRecordServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/impl/HangRecordServiceImpl.java
index 80678e25..c0d692df 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/impl/HangRecordServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/impl/HangRecordServiceImpl.java
@@ -86,6 +86,7 @@ public class HangRecordServiceImpl extends ServiceImpl<HangRecordMapper, HangRec
             BeanUtils.copyProperties(obj, hangRecord1);
             hangRecord1.setHangCode(hangCode);
             hangRecord1.setPoint(point);
+            hangRecord1.setId(null);
             saveList.add(hangRecord1);
         });
         return saveList;