处理合并冲突

src/api/mes_api_gty/otherDocuments.js

@@ -73,14 +73,7 @@ export const getOtherInfo = (params) => {
     params
   })
 }
-// 获取员工姓名
-export const getYg = (params) => {
-  return service({
-    url: '/mes_server/packaging_count_document/getYg',
-    method: 'get',
-    params
-  })
-}
+
 // 拉料计件产量维护修改
 export const updateData = (data) => {
   return service({

src/view/performance/06-packingDocuments/index.vue

@@ -222,7 +222,10 @@
                   width="100"
                 >
                   <template #default="{ row }">
-                    <el-input v-model="row.sczl_dedh" @keyup.enter.native="getDedhsubmit" />
+                    <el-input
+                      v-model="row.sczl_dedh"
+                      @keyup.enter.native="getDedhsubmit"
+                    />
                   </template>
                 </el-table-column>
               </el-table>
@@ -361,7 +364,7 @@ import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/w
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 // import { Download, Search, Delete } from '@element-plus/icons-vue'
 import { reactive, ref } from 'vue'
-import { getGxMc, getInfo, getLocate, getPackingSideTable, getPackingTable, updatePackingTable, getYg, DeletePackingTable, addPackingTable,getDedh } from '@/api/mes_api_gty/myapi'
+import { getGxMc, getInfo, getLocate, getPackingSideTable, getPackingTable, updatePackingTable, getYg, DeletePackingTable, addPackingTable, getDedh } from '@/api/mes_api_gty/myapi'
 
 defineOptions({
   name: '06PackingDocuments',
@@ -712,8 +715,8 @@ const addDetailData = async() => {
       message: '新增成功',
     })
     dialogFormVisible.value = false
-	getTableData()
-	getSideData()
+    getTableData()
+    getSideData()
   }
 }
 
@@ -759,8 +762,8 @@ const enterDialog = () => {
     addDetailData()
   }
 }
-//定额代号回车事件
-const getDedhsubmit = () => {
+// 定额代号回车事件
+const getDedhsubmit = () => {}
 
 let formElements
 const moveFocus = (event) => {

src/view/performance/07-otherDocuments/index.vue

@@ -415,13 +415,13 @@ const setCurrent = (row) => {
 
 // 获取表格数据
 const getTableData = async() => {
-  try {
-    const response = await getTable(params)
-    if (response.code === 0) {
-      total.value = response.data.total
-      tableData.splice(0, tableData.length, ...response.data.rows)
-      setCurrent(tableData[0])
-    }
+  // try {
+  const response = await getTable(params)
+  if (response.code === 0) {
+    total.value = response.data.total
+    tableData.splice(0, tableData.length, ...response.data.rows)
+    setCurrent(tableData[0])
+  }
 }
 
 // 分页设置