From 684efcd77c5871d18aad2da54ea7a489f9de916d Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Fri, 13 Aug 2021 16:20:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B0=83=E6=95=B4=E6=9C=BA?=
 =?UTF-8?q?=E7=94=B5=E7=B1=BB=E6=A3=80=E9=AA=8C=E9=A1=B9=E7=9B=AE=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/jyxm.js                      | 5 +++--
 src/api/ysjl.js                      | 2 +-
 src/controller/jyxmController.js     | 4 ++--
 src/views/ysjl/3000/common/index.vue | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/api/jyxm.js b/src/api/jyxm.js
index 1f349ed..423c55e 100644
--- a/src/api/jyxm.js
+++ b/src/api/jyxm.js
@@ -11,13 +11,14 @@ export default {
       }
     })
   },
-  getJdCyJyxm: (ysjlId, sort) => {
+  getJdCyJyxm: (ysjlId, templateId, orders) => {
     return api({
       url: '/jyxm/getJdJyxmByYsjl',
       method: 'get',
       params: {
         ysjlId: ysjlId,
-        orders: sort
+        templateId: templateId,
+        orders: orders
       }
     })
   },
diff --git a/src/api/ysjl.js b/src/api/ysjl.js
index 78dfe5c..7c2cb95 100644
--- a/src/api/ysjl.js
+++ b/src/api/ysjl.js
@@ -85,7 +85,7 @@ export default {
      */
   getYsjlFb: (ysjlId) => {
     return api({
-      url: '/ysjl/getJyxmInfoByYsjl',
+      url: '/jyxm/getJyxmInfoByYsjl',
       method: 'get',
       params: {
         ysjlId: ysjlId
diff --git a/src/controller/jyxmController.js b/src/controller/jyxmController.js
index e018641..2b2fe2d 100644
--- a/src/controller/jyxmController.js
+++ b/src/controller/jyxmController.js
@@ -28,8 +28,8 @@ export default {
   getCyJyxm(modelId, sort) {
     return jyxm.getCyJyxm(modelId, sort)
   },
-  getJdCyJyxm(ysjlId, sort) {
-    return jyxm.getJdCyJyxm(ysjlId, sort)
+  getJdCyJyxm(ysjlId, templateId, orders) {
+    return jyxm.getJdCyJyxm(ysjlId, templateId, orders)
   },
   /**
      * 找到检验项或者检验目开始的第一条数据，并进行签名
diff --git a/src/views/ysjl/3000/common/index.vue b/src/views/ysjl/3000/common/index.vue
index 59a3789..2ef778c 100644
--- a/src/views/ysjl/3000/common/index.vue
+++ b/src/views/ysjl/3000/common/index.vue
@@ -860,7 +860,7 @@ export default {
     },
     getJyxm(sort) {
       if (this.$route.query.state === 'update') {
-        this.jyxmController.getJdCyJyxm(this.ysjlId, sort).then((data) => {
+        this.jyxmController.getJdCyJyxm(this.ysjlId, this.$route.query.templateId, sort).then((data) => {
           this.bgfyData = data
           console.log(data, 5685)
           this.tableJs.mergeColRows(this.cols, this.rows, data)
@@ -1018,7 +1018,7 @@ export default {
         })
         arr.push(item.data)
       })
-      let arr1 = JSON.parse(JSON.stringify(this.$refs.table1.tableData))
+      const arr1 = JSON.parse(JSON.stringify(this.$refs.table1.tableData))
       arr1.map(item => {
         delete item.name
       })