From 83d2673a13ed4ecc972d5d2241341e13f2214d6c Mon Sep 17 00:00:00 2001
From: cjp <3096114695@qq.com>
Date: Tue, 12 Dec 2023 11:49:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=99=BA=E6=85=A7=E6=A2=81=E5=9C=BAPC?=
 =?UTF-8?q?=E7=AB=AFBUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../smartBeamField/beam-detail.vue            |  9 +++---
 .../smartBeamField/beamManage.vue             |  8 +++--
 .../smartBeamField/pedestalManage.vue         | 30 +++++++++++++++----
 .../smartBeamField/planManage.vue             | 29 +++++++++++-------
 .../smartBeamField/processList.vue            |  4 +--
 .../smartBeamField/productManage.vue          |  4 +--
 6 files changed, 59 insertions(+), 25 deletions(-)

diff --git a/src/views/projectFront/smartBeamField/beam-detail.vue b/src/views/projectFront/smartBeamField/beam-detail.vue
index 20423ef1..09c1a4d4 100644
--- a/src/views/projectFront/smartBeamField/beam-detail.vue
+++ b/src/views/projectFront/smartBeamField/beam-detail.vue
@@ -96,14 +96,14 @@
                     <img src="@/assets/images/icon-edit.png" width="15px" height="15px" />
                     <span>详情</span>
                   </div> -->
-                  <div @click="processEdit(scope.row)" class="operationText" style="margin-right: 30px">
+                  <div @click="processEdit(scope.row)" class="operationText">
                     <img src="@/assets/images/icon-edit.png" width="15px" height="15px" />
                     <span>编辑</span>
                   </div>
-                  <div @click="deleteDev(scope.row)" class="operationText">
+                  <!-- <div @click="deleteDev(scope.row)" class="operationText">
                     <img src="@/assets/images/icon-delete.png" width="15px" height="15px" />
                     <span>删除</span>
-                  </div>
+                  </div> -->
                 </div>
               </template>
             </el-table-column>
@@ -211,7 +211,7 @@
                 </el-table-column>
                 <el-table-column type="index" label="序号" align="center" width="200"></el-table-column>
                 <el-table-column prop="productionLineName" label="生产线名称" align="center"></el-table-column>
-                <el-table-column prop="useProductionLine" label="是否被生产线绑定" align="center">
+                <el-table-column prop="useProductionLine" label="是否被绑定" align="center">
                   <template slot-scope="scope">
                     <div v-if="scope.row.useProductionLine">
                       是
@@ -622,6 +622,7 @@ export default {
           // console.log('成功绑定生产线', res)
           this.closeProductLine()
           this.getProductList()
+          this.getList()
           this.$message.success('绑定成功')
         }
       })
diff --git a/src/views/projectFront/smartBeamField/beamManage.vue b/src/views/projectFront/smartBeamField/beamManage.vue
index e5186626..1d7d6b8e 100644
--- a/src/views/projectFront/smartBeamField/beamManage.vue
+++ b/src/views/projectFront/smartBeamField/beamManage.vue
@@ -546,8 +546,12 @@ export default {
       this.title = '编辑梁'
       this.dialogShow = true
       this.addEditForm = JSON.parse(JSON.stringify(obj))
-      this.addEditForm.markTime = [obj.plannedMakeBeamBeginTime,obj.plannedMakeBeamEndTime]
-      this.addEditForm.erectTime = [obj.plannedErectionBeamBeginTime,obj.plannedErectionBeamEndTime]
+      // 直接使用下列方式直接赋值，会导致回显无法更改与删除问题
+      // this.addEditForm.markTime = [obj.plannedMakeBeamBeginTime, obj.plannedMakeBeamEndTime]
+      // this.addEditForm.erectTime = [obj.plannedErectionBeamBeginTime, obj.plannedErectionBeamEndTime]
+      // 改为下面的代码就不会出现上述问题
+      this.$set(this.addEditForm, 'markTime', [obj.plannedMakeBeamBeginTime, obj.plannedMakeBeamEndTime])
+      this.$set(this.addEditForm, 'erectTime', [obj.plannedErectionBeamBeginTime, obj.plannedErectionBeamEndTime])
       console.log("编辑梁信息",this.addEditForm)
     },
     submit() {
diff --git a/src/views/projectFront/smartBeamField/pedestalManage.vue b/src/views/projectFront/smartBeamField/pedestalManage.vue
index 7295d501..d5b974ae 100644
--- a/src/views/projectFront/smartBeamField/pedestalManage.vue
+++ b/src/views/projectFront/smartBeamField/pedestalManage.vue
@@ -4,7 +4,7 @@
     <div class="searchBox whiteBlock">
       <el-form :inline="true" size="medium" :model="searchForm" ref="searchForm">
         <el-form-item label="台座编号/名称">
-          <el-input placeholder="请输入" v-model="searchForm.makeBeamPedestalSn"></el-input>
+          <el-input placeholder="请输入" v-model="searchForm.makeBeamPedestalSn" clearable></el-input>
         </el-form-item>
         <el-form-item label="日期">
           <el-date-picker
@@ -14,6 +14,7 @@
             :start-placeholder="$t('message.energyManage.start')"
             :end-placeholder="$t('message.energyManage.end')"
             value-format="yyyy-MM-dd"
+            @change="changeDate"
           >
           </el-date-picker>
         </el-form-item>
@@ -96,7 +97,7 @@
         background
       ></el-pagination>
     </div>
-    <!-- 新增桥梁 -->
+    <!-- 新增制梁台座 -->
     <el-dialog :modal-append-to-body="false" :title="cardDialogTitle" :visible.sync="cardDialog" width="667px" @close="close">
       <div class="dialog_content">
         <el-form size="medium" :model="cardForm" ref="cardForm" :rules="cardFormRules" label-width="150px" class="dialogFormBox">
@@ -150,7 +151,9 @@ export default {
         }
       ],
       searchForm: {
-        makeBeamPedestalSn: ''
+        makeBeamPedestalSn: '',
+        actualStartDate: '',
+        actualFinishDate: ''
       },
       cardDialogTitle: '',
       tableData: [],
@@ -187,6 +190,15 @@ export default {
     this.getPointList()
   },
   methods: {
+    changeDate() {
+      if (this.daterange) {
+        this.searchForm.actualStartDate = this.daterange[0]
+        this.searchForm.actualFinishDate = this.daterange[1]
+      } else {
+        this.searchForm.actualStartDate = ''
+        this.searchForm.actualFinishDate = ''
+      }
+    },
     processChange(e) {
       console.log(e, '工序选中')
       const resultArray = e.map(id => {
@@ -266,7 +278,9 @@ export default {
         pageNo: this.pageNo,
         pageSize: this.pageSize,
         projectSn: this.projectSn,
-        bridgeName: this.searchForm.bridgeName
+        makeBeamPedestalSn: this.searchForm.makeBeamPedestalSn,
+        createDate_begin: this.searchForm.actualStartDate,
+        createDate_end: this.searchForm.actualFinishDate
       }
       makeBeamPedestalPage(data).then(res => {
         console.log('----制梁台座列表', res)
@@ -280,6 +294,12 @@ export default {
     },
     editBtn(obj) {
       console.log('编辑的信息', obj)
+      if (obj.pedestalProcess.length > 0) {
+        const dataArray = obj.pedestalProcess.split(',').map(item => item.trim())
+        // console.log(dataArray,"绑扎台序")
+        this.processOptionValue = dataArray
+      }
+
       this.cardDialog = true
       this.isAdding = true
       this.cardForm = JSON.parse(JSON.stringify(obj))
@@ -294,7 +314,7 @@ export default {
     // 删除
     toDelete(val) {
       console.log('删除', val)
-      this.$confirm('此操作将永久删除该巡检点, 是否继续?', '提示', {
+      this.$confirm('此操作将永久删除该制梁台座, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
diff --git a/src/views/projectFront/smartBeamField/planManage.vue b/src/views/projectFront/smartBeamField/planManage.vue
index 0fad04d1..68161889 100644
--- a/src/views/projectFront/smartBeamField/planManage.vue
+++ b/src/views/projectFront/smartBeamField/planManage.vue
@@ -76,7 +76,7 @@
               <el-table-column prop="beamNo" align="center" label="梁号" width="80"></el-table-column>
               <el-table-column prop="bridgeSectionName" align="center" label="所属桥段" width="100"></el-table-column>
               <el-table-column prop="beamAndPlateType" align="center" label="梁板类型" width="100"></el-table-column>
-              <el-table-column prop="beamMakeStatus" align="center" label="制梁状态"  width="90">
+              <el-table-column prop="beamMakeStatus" align="center" label="制梁状态" width="90">
                 <template slot-scope="scope">
                   <div>
                     {{ beamMakeOptions[scope.row.beamMakeStatus - 1].label }}
@@ -105,7 +105,12 @@
                       <img src="@/assets/images/icon-qrcode.png" width="15px" height="15px" />
                       <span>二维码</span>
                     </div>
-                    <div @click="startProduct(scope.row)" class="operationText" style="margin-right: 30px" v-if="scope.row.beamMakeStatus === 1">
+                    <div
+                      @click="startProduct(scope.row)"
+                      class="operationText"
+                      style="margin-right: 30px"
+                      v-if="scope.row.beamMakeStatus === 1"
+                    >
                       <img src="@/assets/images/icon-product.png" width="15px" height="15px" />
                       <span>开始生产</span>
                     </div>
@@ -247,7 +252,7 @@ import {
   smartBridgeSectionDelete,
   smartBridgeSectionPage,
   smartBridgeSectionList,
-  smartBeamFieldBeamStart, // 开始生产
+  smartBeamFieldBeamStart // 开始生产
 } from '@/assets/js/api/smartBeamField.js'
 import beamDetail from '@/views/projectFront/smartBeamField/beam-detail.vue'
 export default {
@@ -259,7 +264,7 @@ export default {
   },
   data() {
     return {
-      beamDetailId: "",
+      beamDetailId: '',
       showLeftDialog: false,
       showBeamDetail: false,
       dateSelect: '',
@@ -406,7 +411,7 @@ export default {
     // 桥段搜索
     sectionChange(e) {
       this.getBridgeSectionList()
-      console.log("搜索桥段",e)
+      console.log('搜索桥段', e)
     },
     // 打开新增桥段弹窗
     handle() {
@@ -546,9 +551,13 @@ export default {
       this.title = '编辑梁'
       this.dialogShow = true
       this.addEditForm = JSON.parse(JSON.stringify(obj))
-      this.addEditForm.markTime = [obj.plannedMakeBeamBeginTime,obj.plannedMakeBeamEndTime]
-      this.addEditForm.erectTime = [obj.plannedErectionBeamBeginTime,obj.plannedErectionBeamEndTime]
-      console.log("编辑梁信息",this.addEditForm)
+      // 直接使用下列方式直接赋值，会导致回显无法更改与删除问题
+      // this.addEditForm.markTime = [obj.plannedMakeBeamBeginTime, obj.plannedMakeBeamEndTime]
+      // this.addEditForm.erectTime = [obj.plannedErectionBeamBeginTime, obj.plannedErectionBeamEndTime]
+      // 改为下面的代码就不会出现上述问题
+      this.$set(this.addEditForm, 'markTime', [obj.plannedMakeBeamBeginTime, obj.plannedMakeBeamEndTime])
+      this.$set(this.addEditForm, 'erectTime', [obj.plannedErectionBeamBeginTime, obj.plannedErectionBeamEndTime])
+      console.log('编辑梁信息', this.addEditForm)
     },
     submit() {
       let params = JSON.parse(JSON.stringify(this.addEditForm))
@@ -655,12 +664,12 @@ export default {
         let a = document.createElement('a')
         console.log(url)
         a.href = url
-        a.download = item.bridgeName
+        a.download = item.beamNo
         a.click()
         document.removeChild(a)
       }
       x.send()
-    },
+    }
   }
 }
 </script>
diff --git a/src/views/projectFront/smartBeamField/processList.vue b/src/views/projectFront/smartBeamField/processList.vue
index 7bc2be46..df1ff15b 100644
--- a/src/views/projectFront/smartBeamField/processList.vue
+++ b/src/views/projectFront/smartBeamField/processList.vue
@@ -167,8 +167,8 @@ export default {
     },
     // 删除
     toDelete(val) {
-      console.log('删除', val)
-      this.$confirm('此操作将永久删除该巡检点, 是否继续?', '提示', {
+      // console.log('删除', val)
+      this.$confirm('此操作将永久删除该工序, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
diff --git a/src/views/projectFront/smartBeamField/productManage.vue b/src/views/projectFront/smartBeamField/productManage.vue
index fdc11df7..a4d325c9 100644
--- a/src/views/projectFront/smartBeamField/productManage.vue
+++ b/src/views/projectFront/smartBeamField/productManage.vue
@@ -301,8 +301,8 @@ export default {
     },
     // 删除
     toDelete(val) {
-      console.log('删除', val)
-      this.$confirm('此操作将永久删除该巡检点, 是否继续?', '提示', {
+      // console.log('删除', val)
+      this.$confirm('此操作将永久删除该生产线, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'