提交

src/api/business/outsourceBalanceAccount.js

@@ -0,0 +1,45 @@
+import request from '@/utils/request'
+const baseUrl = import.meta.env.VITE_APP_PRODUCTION_API
+
+// 查询外协结算列表
+export function listBalanceAccount(query) {
+  return request({
+    url: baseUrl + '/business/balanceAccount/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询外协结算详细
+export function getBalanceAccount(id) {
+  return request({
+    url: baseUrl + '/business/balanceAccount/' + id,
+    method: 'get'
+  })
+}
+
+// 新增外协结算
+export function addBalanceAccount(data) {
+  return request({
+    url: baseUrl + '/business/balanceAccount',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改外协结算
+export function updateBalanceAccount(data) {
+  return request({
+    url: baseUrl + '/business/balanceAccount',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除外协结算
+export function delBalanceAccount(id) {
+  return request({
+    url: baseUrl + '/business/balanceAccount/' + id,
+    method: 'delete'
+  })
+}

src/views/business/outsourceBalanceAccounts/index.vue

@@ -75,64 +75,62 @@
           </vxe-column>
           <vxe-column field="materialLossAmount" title="废品单价" align="center">
           </vxe-column>
-          <vxe-column field="materialLossAmount" title="箱数" align="center">
+          <vxe-column field="carrierNum" title="箱数" align="center">
           </vxe-column>
           <!-- 该序号是工序的的序号 -->
-          <vxe-column field="materialLossAmount" title="序号" align="center">
+          <vxe-column field="processSort" title="序号" align="center">
           </vxe-column>
-          <vxe-column field="materialLossAmount" title="工序代码" align="center">
+          <vxe-column field="processCode" title="工序代码" align="center">
           </vxe-column>
-          <vxe-column field="materialLossAmount" title="结算日期" align="center">
+          <vxe-column field="checkoutDate" title="结算日期" align="center">
           </vxe-column>
-          <vxe-column field="materialLossAmount" title="审核日期" align="center">
+          <vxe-column field="auditDate" title="审核日期" align="center">
           </vxe-column>
-          <vxe-column field="materialLossAmount" title="收回日期" align="center">
+          <vxe-column field="returnDate" title="收回日期" align="center">
           </vxe-column>
-          <vxe-column field="materialLossAmount" title="收回单号" align="center">
+          <vxe-column field="returnNo" title="收回单号" align="center">
           </vxe-column>
-          <vxe-column field="materialLossAmount" title="结算方式" align="center">
+          <vxe-column field="settlementType" title="结算方式" align="center">
           </vxe-column>
-          <vxe-column field="materialLossAmount" title="炉数" align="center">
+          <vxe-column field="furnaceNum" title="炉数" align="center">
           </vxe-column>
-          <vxe-column field="materialLossAmount" title="检查日期" align="center">
+          <vxe-column field="checkDate" title="检查日期" align="center">
           </vxe-column>
-          <vxe-column field="materialLossAmount" title="外协单位码" align="center">
+          <vxe-column field="supplierCode" title="外协单位码" align="center">
           </vxe-column>
-          <vxe-column field="materialLossAmount" title="检查单号" align="center">
+          <vxe-column field="inspectionNo" title="检查单号" align="center">
           </vxe-column>
-          <vxe-column field="materialLossAmount" title="产品编码" align="center">
+          <vxe-column field="productCode" title="产品编码" align="center">
           </vxe-column>
-          <vxe-column field="materialLossAmount" title="料损率" align="center">
+          <vxe-column field="materialLossRatio" title="料损率" align="center">
           </vxe-column>
-          <vxe-column field="materialLossAmount" title="表面" align="center">
+          <vxe-column field="surfaceTreatment" title="表面" align="center">
           </vxe-column>
-          <vxe-column field="materialLossAmount" title="表面" align="center">
+          <vxe-column field="length" title="长度" align="center">
           </vxe-column>
-          <vxe-column field="materialLossAmount" title="长度" align="center">
+          <vxe-column field="materialDiameter" title="材料直径" align="center">
           </vxe-column>
-          <vxe-column field="materialLossAmount" title="材料直径" align="center">
+          <vxe-column field="tolerance" title="公差" align="center">
           </vxe-column>
-          <vxe-column field="materialLossAmount" title="公差" align="center">
+          <vxe-column field="utilizationRatio" title="利用率" align="center">
           </vxe-column>
-          <vxe-column field="materialLossAmount" title="利用率" align="center">
+          <vxe-column field="currency" title="币别" align="center">
           </vxe-column>
-          <vxe-column field="materialLossAmount" title="币别" align="center">
+          <vxe-column field="taxRate" title="税率" align="center">
           </vxe-column>
-          <vxe-column field="materialLossAmount" title="税率" align="center">
+          <vxe-column field="year" title="结算年" align="center">
           </vxe-column>
-          <vxe-column field="materialLossAmount" title="结算年" align="center">
+          <vxe-column field="month" title="结算月" align="center">
           </vxe-column>
-          <vxe-column field="materialLossAmount" title="结算月" align="center">
+          <vxe-column field="wastePriceCategory" title="废品价类别" align="center">
           </vxe-column>
-          <vxe-column field="materialLossAmount" title="废品价类别" align="center">
+          <vxe-column field="rawMaterialCode" title="材料编码" align="center">
           </vxe-column>
-          <vxe-column field="materialLossAmount" title="材料编码" align="center">
+          <vxe-column field="density" title="密度" align="center">
           </vxe-column>
-          <vxe-column field="materialLossAmount" title="密度" align="center">
+          <vxe-column field="shape" title="形状" align="center">
           </vxe-column>
-          <vxe-column field="materialLossAmount" title="形状" align="center">
-          </vxe-column>
-          <vxe-column field="materialLossAmount" title="类别" align="center">
+          <vxe-column field="type" title="类别" align="center">
           </vxe-column>
         </vxe-table>
       </div>
@@ -143,12 +141,19 @@
 <script setup>
 import { ref } from 'vue'
 import region from '@/utils/region.js'
+import { listBalanceAccount } from '@/api/business/outsourceBalanceAccount'
 const tableData = ref([])
 const tableRef = ref(null)
 const handleAdd = () => {
   tableData.value.push(...region.map(e => ({ ...e })))
 }
-
+const queryParams = ref({
+})
+const getList = () => {
+  listBalanceAccount(queryParams.value).then(res => {
+    tableData.value = res.data.rows
+  })
+}
 const changeCellEvent = (params) => {
   const $table = tableRef.value
   if ($table) {
@@ -184,4 +189,5 @@ const handleExport = () => {
 const handleSelectChange = (params) => {
   console.log(params)
 }
+getList()
 </script>

src/views/business/outsourceInspectionVerify/index.vue

@@ -189,16 +189,19 @@ function handleConfirm(row) {
 }
 
 function handleReject(row) {
-
-  proxy.$confirm('是否确认不通过？', '提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  }).then(() => {
-    rejectInspection(row).then(res => {
-      getList();
-    })
-  });
+  checkFurnace(row).then(res => {
+    if (res.code === 200) {
+      proxy.$confirm('是否确认不通过？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        rejectInspection(res.data).then(res => {
+          getList();
+        })
+      });
+    }
+  })
 }