From c054516a38a2613a4e7399ba62694fbd99a606fe Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 06 一月 2023 09:10:09 +0800
Subject: [PATCH] 1.组织架构表格拖动实现demo

---
 src/views/scgl/gd.vue |  215 ++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 176 insertions(+), 39 deletions(-)

diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 79d4bc0..aea5140 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -17,10 +17,10 @@
           :model="form"
           label-width="100px"
           inline
-          style="display: flex;justify-content: space-between"
+          style="display: flex;"
         >
           <div class="elForm">
-            <el-form-item label-width="70px" label="璁㈠崟鐘舵��" style=" display: flex;">
+            <el-form-item label="璁㈠崟鐘舵��" style=" display: flex;">
               <el-select
                 v-model="form.mesorderstus"
                 :popper-append-to-body="false"
@@ -59,7 +59,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item v-show="isExpandForm" label-width="70px" label="浜у搧缂栫爜" style=" display: flex;">
+            <el-form-item v-show="isExpandForm" label="浜у搧缂栫爜" style=" display: flex;">
               <el-input v-model="form.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
             </el-form-item>
             <el-form-item v-show="isExpandForm" label="浜у搧鍚嶇О" style=" display: flex;">
@@ -71,7 +71,7 @@
             <el-form-item v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">
               <el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
             </el-form-item>
-            <el-form-item v-show="isExpandForm" label-width="70px" label="鍒涘缓鏃堕棿" style=" display: flex;">
+            <el-form-item v-show="isExpandForm" label="鍒涘缓鏃堕棿" style=" display: flex;">
               <!--              <el-date-picker-->
               <!--                v-model="form.createdate"-->
               <!--                type="daterange"-->
@@ -93,7 +93,7 @@
             </el-form-item>
           </div>
 
-          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
             <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
             <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
           </div>
@@ -146,8 +146,8 @@
                 v-model="radioSelected"
                 :label="row.wo_code"
                 style="color: transparent;padding-left: 10px;"
-                @change.native="getCurrentRow(row.wo_code)"
               />
+              <!--              @change.native="getCurrentRow(row.wo_code)"-->
             </template>
           </el-table-column>
           <el-table-column
@@ -161,6 +161,7 @@
             label="璁㈠崟鐘舵��"
             sortable="custom"
             width="110"
+            show-tooltip-when-overflow
           >
             <template slot-scope="{row}">
               <div v-if="row.status==='NEW'">鏂板伐鍗�</div>
@@ -169,11 +170,14 @@
               <div v-if="row.status==='ALLO'">宸叉淳鍙�</div>
               <div v-if="row.status==='START'">寮�宸�</div>
               <div v-if="row.status==='CLOSED'">瀹屽伐</div>
+              <div v-if="row.status==='NOSCHED'">寰呮帓绋�</div>
+              <div v-if="row.status==='SCHED'">宸叉帓绋�</div>
             </template>
           </el-table-column>
           <el-table-column
             prop="wo_code"
             label="宸ュ崟缂栧彿"
+            show-tooltip-when-overflow
             sortable="custom"
             min-width="160"
           />
@@ -181,12 +185,19 @@
             prop="m_po"
             label="婧愬崟鍗曞彿"
             sortable="custom"
+            show-tooltip-when-overflow
             min-width="160"
-          />
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.m_po">{{ row.m_po }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="wotype"
             label="鍗曟嵁绫诲瀷"
             sortable="custom"
+            show-tooltip-when-overflow
             min-width="120"
           >
             <template slot-scope="{row}">
@@ -198,6 +209,7 @@
           <el-table-column
             prop="partcode"
             label="浜у搧缂栫爜"
+            show-tooltip-when-overflow
             sortable="custom"
             min-width="120"
           />
@@ -205,6 +217,7 @@
             prop="partname"
             min-width="150"
             label="浜у搧鍚嶇О"
+            show-tooltip-when-overflow
             sortable="custom"
           />
           <el-table-column
@@ -223,11 +236,13 @@
             prop="plan_qty"
             label="宸ュ崟鏁�"
             sortable="custom"
+            show-tooltip-when-overflow
             width="100"
           />
           <el-table-column
             prop="wkshp_name"
             label="鐢熶骇杞﹂棿"
+            show-tooltip-when-overflow
             sortable="custom"
             width="120"
           >
@@ -261,6 +276,7 @@
           <el-table-column
             prop="plan_startdate"
             label="璁″垝寮�濮嬫椂闂�"
+            show-tooltip-when-overflow
             sortable="custom"
             width="160"
           >
@@ -274,6 +290,7 @@
             label="璁″垝缁撴潫鏃堕棿"
             sortable="custom"
             width="160"
+            show-tooltip-when-overflow
           >
             <template slot-scope="{row}">
               <div v-if="row.plan_enddate">{{ row.plan_enddate }}</div>
@@ -283,6 +300,7 @@
           <el-table-column
             prop="piroque"
             label="宸ュ崟绛夌骇"
+            show-tooltip-when-overflow
             sortable="custom"
             width="120"
           >
@@ -295,6 +313,7 @@
           </el-table-column>
           <el-table-column
             prop="lm_user"
+            show-tooltip-when-overflow
             label="鍒涘缓浜哄憳"
             sortable="custom"
             width="120"
@@ -302,6 +321,7 @@
           <el-table-column
             prop="lm_date"
             label="鍒涘缓鏃堕棿"
+            show-tooltip-when-overflow
             width="160"
             sortable="custom"
           />
@@ -319,13 +339,14 @@
                   <!--                    @click="check(row)"-->
                   <!--                  />-->
                   <i
+                    :style="{color:$store.state.settings.theme}"
                     class="el-icon-tickets"
-                    style="cursor: pointer;color: #42b983;margin-right: 15px"
+                    style="cursor: pointer;margin-right: 15px"
                     @click="handlePrint(row.wo_code)"
                   />
                 </el-tooltip>
                 <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
-                  <i class="el-icon-delete" @click="del(row)" />
+                  <i class="el-icon-delete" :style="{color:$store.state.settings.theme}" @click="del(row)" />
                 </el-tooltip>
               </div>
             </template>
@@ -367,6 +388,7 @@
           />
           <el-table-column
             prop="wo_code"
+            show-tooltip-when-overflow
             label="宸ュ崟缂栧彿"
             width="160"
           />
@@ -375,33 +397,40 @@
             prop="partcode"
             label="浜у搧缂栫爜"
             width="150"
+            show-tooltip-when-overflow
           />
           <el-table-column
             prop="partname"
             label="浜у搧鍚嶇О"
             width="200"
+            show-tooltip-when-overflow
           />
 
           <el-table-column
             label="宸ュ簭缂栫爜"
             prop="stepcode"
+            show-tooltip-when-overflow
             width="150"
           />
           <el-table-column
             label="宸ュ簭鍚嶇О"
+            show-tooltip-when-overflow
             prop="stepname"
             width="150"
           />
           <el-table-column
             label="浠诲姟鏁伴噺"
+            show-tooltip-when-overflow
             prop="plan_qty"
           />
           <el-table-column
             label="鍚堟牸鏁伴噺"
+            show-tooltip-when-overflow
             prop="good_qty"
           />
           <el-table-column
             label="涓嶈壇鏁伴噺"
+            show-tooltip-when-overflow
             prop="ng_qty"
           />
           <el-table-column
@@ -414,7 +443,8 @@
                 <el-tooltip class="item" effect="dark" content="鎵撳嵃宸ュ簭" placement="top">
                   <i
                     class="el-icon-tickets"
-                    style="cursor: pointer;color: #42b983;margin-right: 15px"
+                    :style="{color:$store.state.settings.theme}"
+                    style="cursor: pointer;margin-right: 15px"
                     @click="supplementSmallClick(row)"
                   />
                 </el-tooltip>
@@ -587,12 +617,36 @@
             </el-select>
           </el-form-item>
         </div>
+        <el-form-item label="鏄惁鎺掔▼" prop="isAps">
+          <el-radio-group v-model="dialogForm.isAps" style="width:200px" @change="changeIsAps">
+            <el-radio key="Y" label="Y" value="Y">鏄�</el-radio>
+            <el-radio key="N" label="N" value="N">鍚�</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="鐗╂枡娓呭崟" :prop="dialogForm.isAps==='Y'?'bomId':''">
+          <el-select
+            v-model="dialogForm.bomId"
+            filterable
+            :disabled="dialogForm.isAps==='N'"
+            :popper-append-to-body="false"
+            style="width: 200px;"
+            placeholder="璇烽�夋嫨"
+          >
+            <el-option
+              v-for="item in bomIdArr"
+              :key="item.id"
+              :label="item.version"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="璁″垝寮�濮嬫椂闂�" prop="planstartdate">
           <el-date-picker
             v-model="dialogForm.planstartdate"
             type="date"
             :clearable="false"
             value-format="yyyy-MM-dd"
+            :picker-options="pickerOptions"
             style="width: 200px"
             placeholder="閫夋嫨鏃ユ湡"
           />
@@ -605,6 +659,7 @@
             value-format="yyyy-MM-dd"
             style="width: 200px"
             placeholder="閫夋嫨鏃ユ湡"
+            :picker-options="pickerOptions"
           />
         </el-form-item>
         <el-form-item label="宸ュ崟绛夌骇" prop="orderlev">
@@ -623,6 +678,7 @@
             />
           </el-select>
         </el-form-item>
+
       </el-form>
 
       <!--        宸ヨ壓璺嚎鏀惧ぇ闀滃璇濇-->
@@ -653,15 +709,18 @@
           />
           <el-table-column
             prop="stepcode"
+            show-tooltip-when-overflow
             label="宸ュ簭缂栫爜"
           />
           <el-table-column
             prop="stepname"
             label="宸ュ簭鍚嶇О"
+            show-tooltip-when-overflow
           />
           <el-table-column
             prop="flwtype"
             label="宸ュ簭绫诲瀷"
+            show-tooltip-when-overflow
           >
             <template slot-scope="{row}">
               <div v-if="row.flwtype==='W'">澶栧崗</div>
@@ -671,6 +730,7 @@
           <el-table-column
             prop="descr"
             label="宸ュ簭鎻忚堪"
+            show-tooltip-when-overflow
             fixed="right"
           />
         </el-table>
@@ -680,7 +740,12 @@
         <div class="footerButton">
           <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
           <!--          <el-button v-if="operation==='add'" type="primary" @click="dialogVisibleConfirmPreview('add')">棰勮</el-button>-->
-          <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
+          <el-button
+            type="primary"
+            :loading="$store.state.app.buttonIsDisabled"
+            :disabled="$store.state.app.buttonIsDisabled"
+            @click="dialogVisibleConfirm"
+          >纭� 瀹�</el-button>
         </div>
       </span>
     </el-dialog>
@@ -719,15 +784,18 @@
         />
         <el-table-column
           prop="wo_code"
+          show-tooltip-when-overflow
           label="宸ュ崟缂栧彿"
           width="200"
         />
         <el-table-column
           prop="stepcode"
           label="宸ュ簭缂栫爜"
+          show-tooltip-when-overflow
         />
         <el-table-column
           prop="stepname"
+          show-tooltip-when-overflow
           label="宸ュ簭鍚嶇О"
         />
         <!--        <el-table-column-->
@@ -745,14 +813,17 @@
         <!--        />-->
         <el-table-column
           prop="plan_qty"
+          show-tooltip-when-overflow
           label="浠诲姟鏁伴噺"
         />
         <el-table-column
           prop="good_qty"
+          show-tooltip-when-overflow
           label="鍚堟牸鏁伴噺"
         />
         <el-table-column
           prop="ng_qty"
+          show-tooltip-when-overflow
           label="涓嶈壇鏁伴噺"
         />
         <el-table-column
@@ -899,6 +970,7 @@
           :header-cell-style="this.$headerCellStyle"
           :cell-style="this.$cellStyle"
           @sort-change="sourceSortChange"
+          @row-click="getCurrentRowSource"
         >
           <!--          <el-table-column-->
           <!--            type="selection"-->
@@ -913,8 +985,8 @@
                 v-model="radioSelectedId"
                 :label="row.id"
                 style="color: transparent;padding-left: 10px;"
-                @change.native="getCurrentRowSource(row.id)"
               />
+              <!--              @change.native="getCurrentRowSource(row.id)"-->
             </template>
           </el-table-column>
           <el-table-column
@@ -926,6 +998,7 @@
           <el-table-column
             prop="status"
             label="璁㈠崟鐘舵��"
+            show-tooltip-when-overflow
             sortable="custom"
             width="110"
           >
@@ -939,6 +1012,7 @@
           <el-table-column
             prop="wo"
             label="璁㈠崟缂栧彿"
+            show-tooltip-when-overflow
             sortable="custom"
             min-width="150"
           />
@@ -946,17 +1020,20 @@
             prop="partcode"
             label="浜у搧缂栫爜"
             sortable="custom"
+            show-tooltip-when-overflow
             min-width="150"
           />
           <el-table-column
             prop="partname"
             label="浜у搧鍚嶇О"
             sortable="custom"
+            show-tooltip-when-overflow
             min-width="150"
           />
           <el-table-column
             prop="partspec"
             label="浜у搧瑙勬牸"
+            show-tooltip-when-overflow
             sortable="custom"
             min-width="110"
           >
@@ -969,10 +1046,12 @@
             prop="qty"
             label="璁㈠崟鏁伴噺"
             width="150"
+            show-tooltip-when-overflow
             sortable="custom"
           />
           <el-table-column
             prop="relse_qty"
+            show-tooltip-when-overflow
             label="宸蹭笅鍗曟暟閲�"
             width="150"
             sortable="custom"
@@ -980,6 +1059,7 @@
           <el-table-column
             prop="wkshp_name"
             label="鐢熶骇杞﹂棿"
+            show-tooltip-when-overflow
             sortable="custom"
             width="150"
           >
@@ -991,6 +1071,7 @@
           <el-table-column
             prop="planstartdate"
             label="棰勮寮�宸ユ椂闂�"
+            show-tooltip-when-overflow
             sortable="custom"
             width="130"
           >
@@ -1002,6 +1083,7 @@
           <el-table-column
             prop="planenddate"
             label="棰勮瀹屽伐鏃堕棿"
+            show-tooltip-when-overflow
             sortable="custom"
             width="130"
           >
@@ -1013,6 +1095,7 @@
           <el-table-column
             prop="createuser"
             label="鍒涘缓浜哄憳"
+            show-tooltip-when-overflow
             sortable="custom"
             width="150"
           >
@@ -1024,6 +1107,7 @@
           <el-table-column
             prop="createdate"
             label="鍒涘缓鏃堕棿"
+            show-tooltip-when-overflow
             width="130"
             sortable="custom"
           >
@@ -1257,7 +1341,11 @@
                 style="display: flex;height: 96px;border-bottom:1px solid #000;
               justify-content: center;align-items: center;position: relative"
               >
-                <div id="qrCode2" ref="qrCodeDiv2" style="overflow-y: hidden;height:60px;position: absolute;left: 14px;" />
+                <div
+                  id="qrCode2"
+                  ref="qrCodeDiv2"
+                  style="overflow-y: hidden;height:60px;position: absolute;left: 14px;"
+                />
               </div>
               <div
                 style="display: flex;height: 32px;justify-content: flex-start;border-bottom:1px solid #000;align-items: center"
@@ -1314,7 +1402,11 @@
                 style="display: flex;height: 96px;border-bottom:1px solid #000;
               justify-content: center;align-items: center;position: relative"
               >
-                <div id="qrCode2" ref="qrCodeDiv2" style="overflow-y: hidden;height:60px;position: absolute;left: 14px;" />
+                <div
+                  id="qrCode2"
+                  ref="qrCodeDiv2"
+                  style="overflow-y: hidden;height:60px;position: absolute;left: 14px;"
+                />
               </div>
               <div
                 style="display: flex;height: 32px;justify-content: flex-start;border-bottom:1px solid #000;align-items: center"
@@ -1371,7 +1463,11 @@
                 style="display: flex;height: 60px;border-bottom:1px solid #000;
               justify-content: center;align-items: center;position: relative"
               >
-                <div id="qrCode2" ref="qrCodeDiv2" style="overflow-y: hidden;height:60px;position: absolute;left: 14px;" />
+                <div
+                  id="qrCode2"
+                  ref="qrCodeDiv2"
+                  style="overflow-y: hidden;height:60px;position: absolute;left: 14px;"
+                />
               </div>
               <div
                 style="display: flex;height: 20px;justify-content: flex-start;border-bottom:1px solid #000;align-items: center"
@@ -1513,10 +1609,12 @@
           <el-table-column
             prop="stepcode"
             label="宸ュ簭缂栫爜"
+            show-tooltip-when-overflow
           />
           <el-table-column
             prop="stepname"
             label="宸ュ簭鍚嶇О"
+            show-tooltip-when-overflow
           />
           <el-table-column
             prop="enable"
@@ -1552,7 +1650,7 @@
 import {
   AddUpdateMesOrder,
   ClosedMesOrder,
-  DeleteMesOrder, ErpOrderSearch,
+  DeleteMesOrder, ErpOrderSearch, JobCreationSonAddVison,
   MesOrderSearch, PartSelectRoute, RouteSelectWkshop, SearchWorkStep,
   SelectRouteStep
 } from '@/api/scgl'
@@ -1599,7 +1697,9 @@
         // { code: 'CREATED', name: '宸插叧闂�' }
         { code: 'ALLO', name: '宸叉淳鍙�' },
         { code: 'START', name: '寮�宸�' },
-        { code: 'CLOSED', name: '瀹屽伐' }
+        { code: 'CLOSED', name: '瀹屽伐' },
+        { code: 'NOSCHED', name: '寰呮帓绋�' },
+        { code: 'SCHED', name: '宸叉帓绋�' }
       ],
       total: 10,
       radioSelected: '',
@@ -1624,9 +1724,11 @@
         planstartdate: '', // 璁″垝寮�濮嬫椂闂�
         planenddate: '', // 璁″垝瀹屾垚鏃堕棿
         orderlev: '', // 宸ュ崟绛夌骇
-
+        isAps: 'N', // 鏄惁鎺掔▼
+        bomId: '', // 鐗╂枡娓呭崟id
         OperType: '' // 鎿嶄綔绫诲瀷
       },
+      bomIdArr: [], // 鐗╂枡娓呭崟涓嬫媺
       ordertypeArr: [// 宸ュ崟绫诲瀷
         { code: 'PO', name: '鏍囧噯宸ュ崟' },
         { code: 'FO', name: '鎶ュ簾琛ュ崟' }
@@ -1667,6 +1769,12 @@
         ],
         orderlev: [
           { required: true, message: '璇烽�夋嫨宸ュ崟绛夌骇', trigger: ['blur', 'change'] }
+        ],
+        isAps: [
+          { required: true, message: '璇烽�夋嫨鏄惁鎺掔▼', trigger: ['blur', 'change'] }
+        ],
+        bomId: [
+          { required: true, message: '璇烽�夋嫨鐗╂枡娓呭崟', trigger: ['blur', 'change'] }
         ]
 
       },
@@ -1780,7 +1888,12 @@
         // { code: 3, name: '50*40' },
         // { code: 4, name: '50*80' },
         // { code: 5, name: '40*30' }
-      ]
+      ],
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now() - 8.64e7
+        }
+      }
     }
   },
   created() {
@@ -1897,10 +2010,8 @@
       this.dialogForm.planenddate = handleDatetime(new Date())
       this.dialogForm.orderlev = 3
     },
-
     // 浜у搧淇℃伅鍊兼敼鍙�
     async partcodeChange(val) {
-      console.log(val, 22)
       const { data: res } = await PartSelectRoute({ partcode: val })
       this.routeArr = res
 
@@ -1928,6 +2039,18 @@
       const { data: res2 } = await RouteSelectWkshop(data)
       this.wkshopArr = res2
       this.dialogForm.wkshopcode = ''
+    },
+    // 鏄惁鎺掔▼鍊兼敼鍙樻椂
+    changeIsAps(val) {
+      if (val === 'N') {
+        this.dialogForm.bomId = ''
+      }
+      if (val === 'Y') {
+        JobCreationSonAddVison({ partnumber: this.dialogForm.partcode }).then(res => {
+          this.bomIdArr = res.data
+          this.dialogForm.bomId = this.bomIdArr[0].id
+        })
+      }
     },
     // 宸ュ簭浠诲姟
     async check(row) {
@@ -1976,7 +2099,7 @@
     },
     // 鍒犻櫎鎸夐挳
     async del(row) {
-      if (row.status === 'START' || row.status === 'CLOSED') {
+      if (row.status === 'START' || row.status === 'CLOSED' || row.status === 'SCHED') {
         return this.$message.info('姝ゅ伐鍗曚笉鍙垹闄わ紒')
       }
       this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
@@ -1986,7 +2109,7 @@
       }).then(() => {
         console.log(row, 1)
         const data = {
-          souceid: row.sourceid,
+          souceid: row.sourceid ? row.sourceid : '',
           wocode: row.wo_code,
           m_po: row.m_po,
           orderqty: row.plan_qty
@@ -2049,6 +2172,8 @@
       // const { data: res } = await PartSelectRpute({ partcode: val })
       // this.routeArr = res
       // this.dialogForm.routecode = ''
+      this.dialogForm.isAps = 'N'
+      this.dialogForm.bomId = ''
       this.partcodeChange(val)
     },
     // 瀵硅瘽妗嗗叧闂簨浠�
@@ -2071,7 +2196,10 @@
       this.dialogForm.planstartdate = '' // 璁″垝寮�濮嬫椂闂�
       this.dialogForm.planenddate = '' // 璁″垝瀹屾垚鏃堕棿
       this.dialogForm.orderlev = '' // 宸ュ崟绛夌骇
+      this.dialogForm.isAps = 'N' // 鏄惁鎺掔▼
+      this.dialogForm.bomId = ''
 
+      this.bomIdArr = []
       this.$refs.dialogForm.clearValidate()
     },
     // 瀵硅瘽妗嗗彇娑�
@@ -2085,6 +2213,7 @@
           if (this.dialogForm.ordertype === 'FO' && this.dialogForm.sourceorder.toString().trim().length <= 0) {
             return this.$message.info('婧愬崟鍗曞彿涓嶈兘涓虹┖锛�')
           }
+
           const data = {
             // partname: this.dialogForm.partname, // 浜у搧鍚嶇О
             // partspec: this.dialogForm.partspec, // 浜у搧瑙勬牸
@@ -2102,9 +2231,11 @@
             planstartdate: this.dialogForm.planstartdate, // 璁″垝寮�濮嬫椂闂�
             planenddate: this.dialogForm.planenddate, // 璁″垝瀹屾垚鏃堕棿
             orderlev: this.dialogForm.orderlev, // 宸ュ崟绛夌骇
+            is_aps: this.dialogForm.isAps, // 鏄惁鎺掔▼
+            bom_id: this.dialogForm.bomId, // 鐗╂枡娓呭崟id
             OperType: this.operation === 'add' ? 'Add' : 'Update'
           }
-
+          this.$store.state.app.buttonIsDisabled = true
           AddUpdateMesOrder(data).then(res => {
             if (res.code === '200') {
               this.dialogVisible = false
@@ -2114,6 +2245,7 @@
               this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '娲惧彂鎴愬姛锛�')
               // this.dialogVisible = false
               this.getMesOrderSearch()
+              this.$store.state.app.buttonIsDisabled = false
             } else {
               this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '娲惧彂澶辫触锛�')
             }
@@ -2202,9 +2334,9 @@
             // div.scrollTop = div.scrollHeight // 婊氬姩鏉′綅浜庢渶搴曢儴
             div.scrollTop = 0 // 婊氬姩鏉′綅浜庢渶椤堕儴
           })
+          this.dialogVisibleApprove = true
         }
       })
-      this.dialogVisibleApprove = true
     },
     dialogVisibleTaskClose() {
       this.dialogForm.mesordercode = ''
@@ -2375,8 +2507,12 @@
       this.sourceFormTotal = res.count
     },
     // 鍗曢�夋閫変腑鑾峰彇褰撳墠琛屼俊鎭�
-    getCurrentRowSource(id) {
-      this.radioSelectedId = id
+    // getCurrentRowSource2(id) {
+    //   this.radioSelectedId = id
+    // },
+    // 鍗曢�夋閫変腑鑾峰彇褰撳墠琛屼俊鎭�
+    getCurrentRowSource(row, event, column) {
+      this.radioSelectedId = row.id
     },
     sourceSearch() {
       this.getErpOrderSearch()
@@ -2517,9 +2653,8 @@
       this.defaultroute_codeArr = this.dialogFormRoute.routeOperationArr.filter(item => item.isSelected2)
     },
     //  琛岀偣鍑讳簨浠�
-    async   rowClick(row, event, column) {
-      console.log(row, event, column)
-      console.log(row.wo_code, event, column)
+    async rowClick(row, event, column) {
+      this.radioSelected = row.wo_code
       const { data: res } = await SearchWorkStep({ wo_code: row.wo_code })
       this.tableDataDetail = res
     },
@@ -2665,12 +2800,12 @@
   margin-bottom: 0;
 }
 
-//.elTableDiv {
-::v-deep .el-radio__label {
-  display: none;
-}
+.elTableDiv {
+  ::v-deep .el-radio__label {
+    display: none;
+  }
 
-//}
+}
 
 .el-table::before {
   height: 0;
@@ -2839,16 +2974,18 @@
   //}
 }
 
-::v-deep .el-select__caret{
+::v-deep .el-select__caret {
   display: flex;
   align-items: center;
   justify-content: center;
 }
-.tableFixed{
-  ::v-deep .el-table__fixed-right{
+
+.tableFixed {
+  ::v-deep .el-table__fixed-right {
     height: 100% !important;
   }
-  ::v-deep .el-table__fixed{
+
+  ::v-deep .el-table__fixed {
     height: 100% !important;
   }
 }

--
Gitblit v1.9.3