对接接口

src/api/mes_api_gty/timesheet.js

@@ -32,7 +32,7 @@ export const getLocate = (params) => {
 }
 
 // 详情
-export const getTimeDetail = (params) => {
+export const getDetail = (params) => {
   return service({
     url: '/mes_server/piece_work_schedule/detail',
     method: 'get',

src/api/mes_api_gty/workOrderVerification.js

@@ -68,7 +68,7 @@ export const getGxAndLeader = (params) => {
 }
 
 // 2.6修改工单核检单
-export const createData = (data) => {
+export const updateData = (data) => {
   return service({
     url: '/mes_server/work_order_verification/edit',
     method: 'post',

src/view/performance/08-timesheet/index.vue

@@ -22,7 +22,7 @@
               <el-row :span="6">
                 <el-input
                   v-model="searchInfo"
-                  placeholder="输入工单编号或产品名称"
+                  placeholder="输入工单编号"
                 />
               </el-row>
               <el-button
@@ -50,7 +50,7 @@
               :data="tableData"
               row-key="ID"
               border
-              highlight-current-row="true"
+              highlight-current-row
               @selection-change="handleSelectionChange"
               @row-dblclick="doubleClick"
             >
@@ -245,7 +245,7 @@
             <!-- <el-scrollbar height="500px"> -->
             <el-form
               ref="elFormRef"
-              :model="formData"
+              :model="detailData"
               label-position="left"
               :rules="rule"
             >
@@ -257,9 +257,8 @@
                   prop="name"
                 >
                   <el-input
-                    v-model="formData.image"
+                    v-model="detailData.wgjs_rq"
                     :clearable="true"
-                    placeholder="2024.01.03"
                     style="width: 100px;"
                   />
                 </el-form-item>
@@ -291,37 +290,32 @@
               >
                 <el-col :span="3">
                   <el-input
-                    v-model="formData.image"
+                    v-model="detailData.wgjs_bh1"
                     :clearable="true"
-                    placeholder="ZI00401"
                   />
                 </el-col>
                 <el-col :span="3">
                   <el-input
-                    v-model="formData.image"
+                    v-model="detailData.name1"
                     :clearable="true"
-                    placeholder="瞿春生"
                   />
                 </el-col>
                 <el-col :span="3">
                   <el-input
-                    v-model="formData.image"
+                    v-model="detailData.wgjs_js1"
                     :clearable="true"
-                    placeholder="11.0"
                   />
                 </el-col>
                 <el-col :span="12">
                   <el-input
-                    v-model="formData.image"
+                    v-model="detailData.wgjs_yy1"
                     :clearable="true"
-                    placeholder="打包废纸"
                   />
                 </el-col>
                 <el-col :span="3">
                   <el-input
-                    v-model="formData.image"
+                    v-model="detailData.wgjs_冲定额1"
                     :clearable="true"
-                    placeholder="是"
                   />
                 </el-col>
               </el-row>
@@ -333,37 +327,32 @@
               >
                 <el-col :span="3">
                   <el-input
-                    v-model="formData.image"
+                    v-model="detailData.wgjs_bh2"
                     :clearable="true"
-                    placeholder="ZI00401"
                   />
                 </el-col>
                 <el-col :span="3">
                   <el-input
-                    v-model="formData.image"
+                    v-model="detailData.name2"
                     :clearable="true"
-                    placeholder="瞿春生"
                   />
                 </el-col>
                 <el-col :span="3">
                   <el-input
-                    v-model="formData.image"
+                    v-model="detailData.wgjs_js2"
                     :clearable="true"
-                    placeholder="11.0"
                   />
                 </el-col>
                 <el-col :span="12">
                   <el-input
-                    v-model="formData.image"
+                    v-model="detailData.wgjs_yy2"
                     :clearable="true"
-                    placeholder="打包废纸"
                   />
                 </el-col>
                 <el-col :span="3">
                   <el-input
-                    v-model="formData.image"
+                    v-model="detailData.wgjs_冲定额2"
                     :clearable="true"
-                    placeholder="是"
                   />
                 </el-col>
               </el-row>
@@ -375,37 +364,32 @@
               >
                 <el-col :span="3">
                   <el-input
-                    v-model="formData.image"
+                    v-model="detailData.wgjs_bh3"
                     :clearable="true"
-                    placeholder="ZI00401"
                   />
                 </el-col>
                 <el-col :span="3">
                   <el-input
-                    v-model="formData.image"
+                    v-model="detailData.name3"
                     :clearable="true"
-                    placeholder="瞿春生"
                   />
                 </el-col>
                 <el-col :span="3">
                   <el-input
-                    v-model="formData.image"
+                    v-model="detailData.wgjs_js3"
                     :clearable="true"
-                    placeholder="11.0"
                   />
                 </el-col>
                 <el-col :span="12">
                   <el-input
-                    v-model="formData.image"
+                    v-model="detailData.wgjs_yy3"
                     :clearable="true"
-                    placeholder="打包废纸"
                   />
                 </el-col>
                 <el-col :span="3">
                   <el-input
-                    v-model="formData.image"
+                    v-model="detailData.wgjs_冲定额3"
                     :clearable="true"
-                    placeholder="是"
                   />
                 </el-col>
               </el-row>
@@ -417,37 +401,32 @@
               >
                 <el-col :span="3">
                   <el-input
-                    v-model="formData.image"
+                    v-model="detailData.wgjs_bh4"
                     :clearable="true"
-                    placeholder="ZI00401"
                   />
                 </el-col>
                 <el-col :span="3">
                   <el-input
-                    v-model="formData.image"
+                    v-model="detailData.name4"
                     :clearable="true"
-                    placeholder="瞿春生"
                   />
                 </el-col>
                 <el-col :span="3">
                   <el-input
-                    v-model="formData.image"
+                    v-model="detailData.wgjs_js4"
                     :clearable="true"
-                    placeholder="11.0"
                   />
                 </el-col>
                 <el-col :span="12">
                   <el-input
-                    v-model="formData.image"
+                    v-model="detailData.wgjs_yy4"
                     :clearable="true"
-                    placeholder="打包废纸"
                   />
                 </el-col>
                 <el-col :span="3">
                   <el-input
-                    v-model="formData.image"
+                    v-model="detailData.wgjs_冲定额4"
                     :clearable="true"
-                    placeholder="是"
                   />
                 </el-col>
               </el-row>
@@ -459,37 +438,32 @@
               >
                 <el-col :span="3">
                   <el-input
-                    v-model="formData.image"
+                    v-model="detailData.wgjs_bh5"
                     :clearable="true"
-                    placeholder="ZI00401"
                   />
                 </el-col>
                 <el-col :span="3">
                   <el-input
-                    v-model="formData.image"
+                    v-model="detailData.name5"
                     :clearable="true"
-                    placeholder="瞿春生"
                   />
                 </el-col>
                 <el-col :span="3">
                   <el-input
-                    v-model="formData.image"
+                    v-model="detailData.wgjs_js5"
                     :clearable="true"
-                    placeholder="11.0"
                   />
                 </el-col>
                 <el-col :span="12">
                   <el-input
-                    v-model="formData.image"
+                    v-model="detailData.wgjs_yy5"
                     :clearable="true"
-                    placeholder="打包废纸"
                   />
                 </el-col>
                 <el-col :span="3">
                   <el-input
-                    v-model="formData.image"
+                    v-model="detailData.wgjs_冲定额5"
                     :clearable="true"
-                    placeholder="是"
                   />
                 </el-col>
               </el-row>
@@ -501,37 +475,32 @@
               >
                 <el-col :span="3">
                   <el-input
-                    v-model="formData.image"
+                    v-model="detailData.wgjs_bh6"
                     :clearable="true"
-                    placeholder="ZI00401"
                   />
                 </el-col>
                 <el-col :span="3">
                   <el-input
-                    v-model="formData.image"
+                    v-model="detailData.name6"
                     :clearable="true"
-                    placeholder="瞿春生"
                   />
                 </el-col>
                 <el-col :span="3">
                   <el-input
-                    v-model="formData.image"
+                    v-model="detailData.wgjs_js6"
                     :clearable="true"
-                    placeholder="11.0"
                   />
                 </el-col>
                 <el-col :span="12">
                   <el-input
-                    v-model="formData.image"
+                    v-model="detailData.wgjs_yy6"
                     :clearable="true"
-                    placeholder="打包废纸"
                   />
                 </el-col>
                 <el-col :span="3">
                   <el-input
-                    v-model="formData.image"
+                    v-model="detailData.wgjs_冲定额6"
                     :clearable="true"
-                    placeholder="是"
                   />
                 </el-col>
               </el-row>
@@ -571,7 +540,7 @@ import { getDictFunc, formatDate, formatBoolean, filterDict, ReturnArrImg, onDow
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Search, Refresh, Download } from '@element-plus/icons-vue'
 import { ref, reactive, onMounted, onBeforeMount } from 'vue'
-import { getSide, getTable } from '@/api/mes_api_gty/timesheet'
+import { getSide, getTable, getDetail, updateData } from '@/api/mes_api_gty/timesheet'
 
 defineOptions({
   name: '08Timesheet'
@@ -593,35 +562,6 @@ const getSideData = async() => {
 }
 getSideData()
 
-// 自动化生成的字典（可能为空）以及字段
-const formData = ref({
-  rq: '',
-  ygbh1: '',
-  xm1: '',
-  szbm: '',
-  js1: '',
-  yy1: '',
-  ygbh2: '',
-  xm2: '',
-  js2: '',
-  cl2: '',
-  ygbh3: '',
-  xm3: '',
-  js3: '',
-  cl3: '',
-  ygbh4: '',
-  xm4: '',
-  js4: '',
-  cl4: '',
-  ygbh5: '',
-  xm5: '',
-  js5: '',
-  cl5: '',
-  ygbh6: '',
-  xm6: '',
-  js6: '',
-})
-
 // 验证规则
 const rule = reactive({
 })
@@ -630,35 +570,7 @@ const elFormRef = ref()
 const elSearchFormRef = ref()
 
 // 表格数据部分
-const tableData = reactive([
-  {
-    rq: '2023/12/31 ',
-    ygbh1: 'ZM00369',
-    xm1: '曹会灵',
-    szbm: '模切车间',
-    js1: '9',
-    yy1: '打包废纸',
-    ygbh2: 'M00141',
-    xm2: '张超',
-    js2: '17',
-    cl2: '',
-    ygbh3: '',
-    xm3: '',
-    js3: '',
-    cl3: '',
-    ygbh4: '',
-    xm4: '',
-    js4: '',
-    cl4: '',
-    ygbh5: '',
-    xm5: '',
-    js5: '',
-    cl5: '',
-    ygbh6: '',
-    xm6: '',
-    js6: '',
-  },
-])
+const tableData = reactive([])
 const page = ref(1)
 const total = ref(0)
 const limit = ref(10)
@@ -702,6 +614,41 @@ const handleNodeClick = (node, check) => {
 function onSearch() {
 }
 
+// ============== 详情页面 ==============
+const detailData = reactive({})
+
+// 行为控制标记（弹窗内部需要增还是改）
+const type = ref('')
+// 弹窗控制标记
+const dialogFormVisible = ref(false)
+
+// 双击表格操作
+async function doubleClick(row, column, event) {
+  type.value = 'update'
+  const { wgjs_rq, wgjs_bh1 } = row
+  const res = await getDetail({ wgjs_rq, wgjs_bh1 })
+  if (res.code === 0) {
+    Object.assign(detailData, res.data)
+    dialogFormVisible.value = true
+    console.log(detailData)
+  }
+}
+
+// 更新数据
+const enterDialog = async() => {
+  const obj = detailData
+  for (let i = 1; i <= 6; i++) {
+    delete obj[`name${i}`]
+  }
+  const res = await updateData(obj)
+  if (res.code === 0) {
+    ElMessage({
+      type: 'success',
+      message: '更新成功'
+    })
+  }
+}
+
 // 获取需要的字典 可能为空 按需保留
 const setOptions = async() => {
 }
@@ -747,70 +694,19 @@ const onDelete = async() => {
   }
 }
 
-// 行为控制标记（弹窗内部需要增还是改）
-const type = ref('')
-
 // 更新行
 const updateCompanyFunc = async(row) => {
   const res = await findCompany({ ID: row.ID })
   type.value = 'update'
   if (res.code === 0) {
-    formData.value = res.data.recompany
+    detailData.value = res.data.recompany
     dialogFormVisible.value = true
   }
 }
 
-// 弹窗控制标记
-const dialogFormVisible = ref(false)
-
-// 打开弹窗
-const openDialog = () => {
-  type.value = 'create'
-  dialogFormVisible.value = true
-}
-
 // 关闭弹窗
 const closeDialog = () => {
   dialogFormVisible.value = false
-  formData.value = {
-    address: '',
-    image: '',
-    name: '',
-  }
-}
-// 弹窗确定
-const enterDialog = async() => {
-  elFormRef.value?.validate(async(valid) => {
-    if (!valid) return
-    let res
-    switch (type.value) {
-      case 'create':
-        res = await createCompany(formData.value)
-        break
-      case 'update':
-        res = await updateCompany(formData.value)
-        break
-      default:
-        res = await createCompany(formData.value)
-        break
-    }
-    if (res.code === 0) {
-      ElMessage({
-        type: 'success',
-        message: '创建/更改成功'
-      })
-      closeDialog()
-      getTableData()
-    }
-  })
-}
-
-// 双击表格操作
-function doubleClick(row, column, event) {
-  console.log(row, column, event)
-  // updateCompanyFunc(row);
-  type.value = 'update'
-  dialogFormVisible.value = true
 }
 
 // 导出excel

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

@@ -406,7 +406,7 @@ import { getDictFunc, formatDate, formatBoolean, filterDict, ReturnArrImg, onDow
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Search, Refresh, Download } from '@element-plus/icons-vue'
 import { ref, reactive, onMounted, onBeforeMount } from 'vue'
-import { getSide, getTable, getOneWorkOrder, getOrderInfo, getGxAndLeader, getWastInfo } from '@/api/mes_api_gty/workOrderVerification'
+import { getSide, getTable, getOneWorkOrder, getOrderInfo, getGxAndLeader, getWastInfo, updateData } from '@/api/mes_api_gty/workOrderVerification'
 
 defineOptions({
   name: '06PackingDocuments'
@@ -491,7 +491,8 @@ const getTableData = async() => {
   const response = await getTable(params)
   if (response.code === 0) {
     total.value = response.data.total
-    tableData.splice(0, tableData.length, ...response.data.rows)
+    Object.assign(tableData, response.data.rows)
+    // tableData.splice(0, tableData.length, ...response.data.rows)
   }
 }
 
@@ -507,6 +508,11 @@ const handleNodeClick = (node, check) => {
 
 // 搜索
 function handleSearch() {
+  params.sys_id = ''
+  params.date = ''
+  params.order = searchInfo.value
+  page.value = 1
+  handleCurrentChange()
 }
 
 // 分页
@@ -552,6 +558,10 @@ const getDetailData = async(id) => {
           obj[key] = obj[key].trim()
         }
       }
+      // 修改日期格式
+      if (Object.prototype.hasOwnProperty.call(obj, 'qczl_rq') && typeof obj['qczl_rq'] === 'string') {
+        obj['qczl_rq'] = obj['qczl_rq'].split(' ')[0]
+      }
 
       Object.assign(detailData, obj)
       const table = []
@@ -699,7 +709,25 @@ const handleSelectClick = (row, column, event) => {
 
 // 弹窗确定
 const enterDialog = async() => {
-  const restoredData = {}
+  const restoredData = {
+    UniqId: detailData.UniqId,
+    qczl_gdbh: detailData.qczl_gdbh,
+    qczl_yjno: detailData.qczl_yjno,
+    qczl_gxh: detailData.qczl_gxh,
+    qczl_gxmc: detailData.qczl_gxmc,
+    qczl_rq: detailData.qczl_rq,
+    qczl_fp: detailData.qczl_fp,
+    qczl_num: detailData.qczl_num,
+    qczl_NumDesc: detailData.qczl_NumDesc,
+    qczl_NumDesc1: detailData.qczl_NumDesc1,
+    qczl_NumDesc2: detailData.qczl_NumDesc2,
+    qczl_NumDesc3: detailData.qczl_NumDesc3,
+    qczl_NumDesc4: detailData.qczl_NumDesc4,
+    qczl_NumDesc5: detailData.qczl_NumDesc5,
+    qczl_NumDesc6: detailData.qczl_NumDesc6,
+    qczl_NumDesc7: detailData.qczl_NumDesc7,
+    qczl_NumDesc8: detailData.qczl_NumDesc8,
+  }
   detailData.table.forEach((item, index) => {
     const num = index + 1
     restoredData[`fp_lb${num}`] = item.fp_lb
@@ -708,7 +736,14 @@ const enterDialog = async() => {
     restoredData[`fp_bz${num}`] = item.fp_bz
     restoredData[`fp_gxmc${num}`] = item.fp_gxmc
   })
-  console.log(restoredData)
+  const res = await updateData(restoredData)
+  if (res.code === 0) {
+    ElMessage({
+      type: 'success',
+      message: res.msg,
+    })
+    dialogFormVisible.value = false
+  }
 }
 
 // 多选