From feb85968da9caa3068e495520885e6e738c56987 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 10 四月 2024 17:47:20 +0800
Subject: [PATCH] 产量登记列表的接口联调和字段调试+删除产品登记的接口联调+新增产品登记的页面样式调整+

---
 src/api/productManage/productRegisterForm.js          |   77 +++++++++++++++-----------------------
 src/views/productManage/productRegisterForm/index.vue |   24 ++++++------
 2 files changed, 42 insertions(+), 59 deletions(-)

diff --git a/src/api/productManage/productRegisterForm.js b/src/api/productManage/productRegisterForm.js
index 95b4d92..b112837 100644
--- a/src/api/productManage/productRegisterForm.js
+++ b/src/api/productManage/productRegisterForm.js
@@ -1,66 +1,49 @@
 import request from "@/common/untils/request.js"
-// 绾ゅ害鐧昏鍒楄〃 
-export function getRegisterList(data) {
+// 浜ч噺鐧昏鍒楄〃
+export function getYieldRegisterList(data) {
   return request({
-    url: "/api-jl/v1/fineness/register?page="+ data.page+"&pageSize="+data.pageSize+"&keyword="+data.keyword,
-    method: "get",
-    data
-  })
-}
-
-//淇濆瓨绾ゅ害鐧昏
-export function saveRegister(data) {
-  return request({
-    url: "/api-jl/v1/fineness/register",
+    url: "/api-jl/v1/fineness/getYieldRegisterList",
     method: "post",
     data
   })
 }
-// 绾ゅ害鐧昏琛ㄧ殑璇︽儏
-export function getRegisterDetails(data) {
+//淇濆瓨浜ч噺鐧昏
+export function saveYieldRegister(data) {
   return request({
-    url: "/api-jl/v1/fineness/register/"+data.id,
-    method: "get",
+    url: "/api-jl/v1/fineness/saveYieldRegister",
+    method: "post",
     data
   })
 }
-// 鍒犻櫎绾ゅ害鐧昏鍒楄〃
-export function getDeleteRegister(data) {
+// 浜ч噺鐧昏琛ㄧ殑璇︽儏
+export function getYieldRegisterInfo(data) {
   return request({
-    url: "/api-jl/v1/fineness/register/"+data.id,
+    url: "/api-jl/v1/fineness/getYieldRegisterInfo",
+    method: "post",
+    data
+  })
+}
+// 鍒犻櫎浜ч噺鐧昏鍒楄〃
+export function deleteYieldRegister(data) {
+  return request({
+    url: "/api-jl/v1/fineness/deleteYieldRegister/"+data.number,
     method: "delete",
     data
   })
 }
-// 绾ゅ害鐧昏 select鏁版嵁
-export function getDictList(data) {
+// 鑾峰彇杞﹁締缂栧彿
+export function getWorkshopManageCar(data) {
   return request({
-    url: "/api-jl/v1/system/dict?dictType="+data.dictType,
+    url: "/api-jl/v1/system/getWorkshopManageCar",
+    method: "post",
+    data
+  })
+}
+// 鑾峰彇杞﹁締缂栧彿
+export function getWorkshopManageGroup(data) {
+  return request({
+    url: "/api-jl/v1/system/getWorkshopManageGroup/"+data.number,
     method: "get",
     data
   })
-}
-// 绾ゅ害鐧昏琛� 缁勫埆鐨勬暟鎹�
-export function getWorkshopManageList(data) {
-  return request({
-    url: "/api-jl/v1/system/getWorkshopManageList",
-    method: "get",
-    data
-  })
-}
-// 鏇存柊璺熻繘璁板綍
-export function getUpdateFollowRecord(data) {
-  return request({
-    url: "/api/followRecord/update",
-    method: "put",
-    data
-  })
-}
-
-// 鑱旂郴鏂瑰紡鍒楄〃
-export function getContactInfoList() {
-  return request({
-    url: "/api/contactInformation/list",
-    method: "get"
-  })
-}
+}
\ No newline at end of file
diff --git a/src/views/productManage/productRegisterForm/index.vue b/src/views/productManage/productRegisterForm/index.vue
index 5413f60..d92f382 100644
--- a/src/views/productManage/productRegisterForm/index.vue
+++ b/src/views/productManage/productRegisterForm/index.vue
@@ -14,7 +14,7 @@
             <el-table-column label="鎿嶄綔" width="180">
               <template slot-scope="scope">
                 <el-button @click="editClick(scope.row)" type="text" size="small">缂栬緫</el-button>
-                <el-button @click="delClick(scope.row.id)" type="text" size="small">鍒犻櫎</el-button>
+                <el-button @click="delClick(scope.row)" type="text" size="small">鍒犻櫎</el-button>
               </template>
             </el-table-column>
           </template>
@@ -29,7 +29,7 @@
 
 <script>
 import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
-import { getRegisterList,getDeleteRegister } from "@/api/productManage/productRegisterForm.js"
+import { getYieldRegisterList,deleteYieldRegister } from "@/api/productManage/productRegisterForm.js"
 export default {
   name: "productRegisterForm",
   props: {},
@@ -43,13 +43,13 @@
       keyword: '',
       tableColumn: [
         { label: "缂栧彿", prop: "number", min: 100, default: true },
-        { label: "鐢熶骇鏃堕棿", prop: "member_name" },
-        { label: "杞︾粍", prop: "workshopGroup" },
+        { label: "鐢熶骇鏃堕棿", prop: "createTime", min: 110, },
+        { label: "杞︾粍", prop: "groupNumber" },
         { label: "瑙勬牸", prop: "spec", min: 90 },
-        { label: "杞﹂棿", prop: "name", min: 200 },
-        { label: "搴勫彛", prop: "market" },
-        { label: "鍥炴暟", prop: "contact_name", isContactClick: true },
-        { label: "杞︾粍鎬讳骇閲�", prop: "contact_phone" }
+        { label: "杞﹂棿", prop: "workshopName", min: 200 },
+        { label: "搴勫彛", prop: "marketName" },
+        { label: "鍥炴暟", prop: "circle",},
+        { label: "杞︾粍鎬讳骇閲�", prop: "total" }
       ],
       showCol: ["缂栧彿", "鐢熶骇鏃堕棿", "杞︾粍", "瑙勬牸", "杞﹂棿", "搴勫彛", "鍥炴暟", "杞︾粍鎬讳骇閲�"]
     }
@@ -90,7 +90,7 @@
      // 璇锋眰鏁版嵁
      async getData() {
       this.loading = true
-      await getRegisterList({
+      await getYieldRegisterList({
         keyword: this.keyword,
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize
@@ -142,19 +142,19 @@
          name:'addProductRegisterPage',
          query:{
             id:row.ID,
-            inspectID:row.finenessCheckID,
+            number:row.number,
           }
         });
     },
     // 鍒犻櫎
-    delClick(id) {
+    delClick(row) {
       this.$confirm("璇风‘璁ゆ槸鍚﹀垹闄わ紝鍒犻櫎鎿嶄綔涓嶅彲鎾ら攢?", "璀﹀憡", {
         confirmButtonText: "纭畾",
         cancelButtonText: "鍙栨秷",
         type: "warning"
       })
         .then(() => {
-          getDeleteRegister({ id: id }).then((response) => {
+          deleteYieldRegister({ number: row.number }).then((response) => {
             if (response.code === 200) {
               this.$message.success("鍒犻櫎鎴愬姛")
               this.getData()

--
Gitblit v1.8.0