绩效管理

src/view/performance/09-workOrderVerification/index.vue

@@ -191,7 +191,7 @@
                 <el-input
                   v-model="detailData.qczl_gxmc"
                   style="width: 200px;"
-				  @keyup.enter.native="getgxsubmit"
+                  @keyup.enter.native="getgxsubmit"
                 />
               </el-form-item>
               <el-form-item
@@ -302,7 +302,7 @@
                   >
                     <template #default="{ row }">
                       <el-input
-                        v-model="row.fp_gxmc"                       
+                        v-model="row.fp_gxmc"
                       />
                     </template>
                   </el-table-column>
@@ -323,7 +323,7 @@
                   >
                     <template #default="{ row }">
                       <el-input
-                        v-model="row.fp_bh"                       
+                        v-model="row.fp_bh"
                       />
                     </template>
                   </el-table-column>
@@ -396,39 +396,39 @@
               />
             </el-table>
           </el-dialog>
-		  
-		  <el-dialog
-		    v-model="GetjtbhVisible"
-		    title="选择"
-		    destroy-on-close
-		    width="600px"
-		  			>
-		    <el-table
-		      tooltip-effect="dark"
-		      :data="JTBHselectData"
-		      row-key="ID"
-		      highlight-current-row="true"
-		      border
-		      style="width:100%"
-		      @row-dblclick="JTBHSelectClick"
-		    >
-		      <el-table-column
-		        prop="gxh"
-		        label="工序号"
-		        width="70"
-		      />
-			  <el-table-column
-				prop="gxmc"
-				label="工序名称"
-				width="150"
-			  />
-			  <el-table-column
-				prop="addGxmc"
-				label="工序名称"
-				width="150"
-			  />
-		    </el-table>
-		  </el-dialog>
+
+          <el-dialog
+            v-model="GetjtbhVisible"
+            title="选择"
+            destroy-on-close
+            width="600px"
+          >
+            <el-table
+              tooltip-effect="dark"
+              :data="JTBHselectData"
+              row-key="ID"
+              highlight-current-row="true"
+              border
+              style="width:100%"
+              @row-dblclick="JTBHSelectClick"
+            >
+              <el-table-column
+                prop="gxh"
+                label="工序号"
+                width="70"
+              />
+              <el-table-column
+                prop="gxmc"
+                label="工序名称"
+                width="150"
+              />
+              <el-table-column
+                prop="addGxmc"
+                label="工序名称"
+                width="150"
+              />
+            </el-table>
+          </el-dialog>
 
           <!-- 废品日统计 -->
           <Meirihejiantongji
@@ -471,7 +471,7 @@ import {
 import { ElMessage } from 'element-plus'
 import { Search, Refresh, Download } from '@element-plus/icons-vue'
 import { ref, reactive } from 'vue'
-import { getSide, getTable, getOneWorkOrder, getOrderInfo, getGxAndLeader, getYjInfo,getWastInfo, updateData, add } from '@/api/mes_api_gty/workOrderVerification'
+import { getSide, getTable, getOneWorkOrder, getOrderInfo, getGxAndLeader, getYjInfo, getWastInfo, updateData, add } from '@/api/mes_api_gty/workOrderVerification'
 import Meirihejiantongji from '@/view/performance/09-workOrderVerification/componets/meirihejiantongji.vue'
 import Gongdanzhijianfeipintongji from '@/view/performance/09-workOrderVerification/componets/gongdanzhijianfeipintongji.vue'
 import Shebeizhuangtai from '@/view/performance/09-workOrderVerification/componets/shebeizhuangtai.vue'
@@ -550,39 +550,40 @@ const params = {
   page: page.value.toString(),
   limit: limit.value.toString(),
 }
-//获取工序
+// 获取工序
 const getgxsubmit = () => {
-	 GetJtbh()
+  GetJtbh()
 }
-const GetJtbh = async () => {
+const GetJtbh = async() => {
   try {
-    const response = await getYjInfo({ order: '2312185', yj_no: '1' });
+    const { qczl_gdbh, qczl_yjno } = detailData
+    const response = await getYjInfo({ order: qczl_gdbh, yj_no: qczl_yjno })
     if (response.code === 0) {
-      const data = response.data;
+      const data = response.data
       if (data) {
         const tableData = data.gx_data.map(item => ({
           gxh: item.Gy0_gxh,
-          gxmc: item.Gy0_gxmc+'-'+item.Add_gxmc,
+          gxmc: item.Gy0_gxmc + (item.Add_gxmc === '' ? '' : '-' + item.Add_gxmc),
           // addGxmc: item.Add_gxmc
-        }));
-        console.log(tableData);
-        JTBHselectData.splice(0, JTBHselectData.length, ...tableData);
-        GetjtbhVisible.value = true;
+        }))
+        console.log(tableData)
+        JTBHselectData.splice(0, JTBHselectData.length, ...tableData)
+        GetjtbhVisible.value = true
         // Now you can use the tableData to populate your table
       } else {
-        console.log('No data found');
+        console.log('No data found')
       }
     } else {
-      console.log('Error: ', response.msg);
+      console.log('Error: ', response.msg)
     }
   } catch (error) {
-    console.error('Error fetching data: ', error);
+    console.error('Error fetching data: ', error)
   }
-};
+}
 const JTBHSelectClick = (row, column, event) => {
   const { gxh, gxmc } = row
-  detailData.qczl_gxmc=gxh+'-'+gxmc
-  detailData.qczl_gxh=gxh
+  detailData.qczl_gxmc = gxh + '-' + gxmc
+  detailData.qczl_gxh = gxh
   GetjtbhVisible.value = false
 }
 // 批量删除控制标记
@@ -594,9 +595,9 @@ const getTableData = async() => {
   if (response.code === 0) {
     total.value = response.data.total
     // Object.assign(tableData, response.data.rows)
-	 
+
     tableData.splice(0, tableData.length, ...response.data.rows)
-	minUniqId.value= Math.min(...tableData.map(row => row.UniqId));
+    minUniqId.value = Math.min(...tableData.map(row => row.UniqId))
   }
 }
 
@@ -975,7 +976,7 @@ const handleShowAdd = async() => {
   type.value = '新增'
   // console.log()
   getDetailData(minUniqId.value)
-  
+
   // type.value='add'
   //    Object.assign(detailData);
   // dialogFormVisible.value = true