fix：[试验管理][预填表单，填报表单]完善

src/api/business/study/studyFormFill.js

@@ -34,6 +34,42 @@ export function studyFormFill_info(query) {
   })
 }
 
+//加签
+export function studyFormFill_jq(data) {
+  return request({
+    url: '/system/business/studyFormFill/jq',
+    method: 'post',
+    data: data
+  })
+}
+
+//废止
+export function studyFormFill_fz(data) {
+  return request({
+    url: '/system/business/studyFormFill/fz',
+    method: 'post',
+    data: data
+  })
+}
+
+//审核废止
+export function studyFormFill_shfz(data) {
+  return request({
+    url: '/system/business/studyFormFill/shfz',
+    method: 'post',
+    data: data
+  })
+}
+
+//更换归属人
+export function studyFormFill_ghgsr(data) {
+  return request({
+    url: '/system/business/studyFormFill/ghgsr',
+    method: 'post',
+    data: data
+  })
+}
+
 //保存
 export function studyFormFill_bc(data) {
   return request({
@@ -52,15 +88,32 @@ export function studyFormFill_tj(data) {
   })
 }
 
-//填报
-export function studyFormFill_tb(data) {
+//观察
+export function studyFormFill_gc(data) {
+  return request({
+    url: '/system/business/studyFormFill/gc',
+    method: 'post',
+    data: data
+  })
+}
+
+//复核通过
+export function studyFormFill_fhtg(data) {
   return request({
-    url: '/system/business/studyFormFill/tb',
+    url: '/system/business/studyFormFill/fhtg',
     method: 'post',
     data: data
   })
 }
 
+//复核拒绝
+export function studyFormFill_fhjj(data) {
+  return request({
+    url: '/system/business/studyFormFill/fhjj',
+    method: 'post',
+    data: data
+  })
+}
 
 //通过
 export function studyFormFill_tg(data) {
@@ -71,12 +124,11 @@ export function studyFormFill_tg(data) {
   })
 }
 
-
-//拒绝
-export function studyFormFill_jj(data) {
+//审阅
+export function studyFormFill_sy(data) {
   return request({
-    url: '/system/business/studyFormFill/jj',
+    url: '/system/business/studyFormFill/sy',
     method: 'post',
     data: data
   })
-}
+}

src/lang/en/business/study/studyFormFill.js

@@ -33,4 +33,12 @@ export default {
  dcbjjcgj:'导出(编辑稽查轨迹)',
  dcxgjcgj:'导出(修改稽查轨迹)',
  dcbhsjgj:'导出(不含数据轨迹)',
+
+ tbz:'填报中',
+ ytj:'已提交',
+ ywc:'已完成',
+ ywcfh:'已完成（经复核）',
+ ywc:'已完成',
+ dfz:'待废止',
+ yfz:'已废止',
 }

src/lang/zh/business/study/studyFormFill.js

@@ -32,4 +32,13 @@ export default {
  dcbjjcgj:'导出(编辑稽查轨迹)',
  dcxgjcgj:'导出(修改稽查轨迹)',
  dcbhsjgj:'导出(不含数据轨迹)',
+
+ tbz:'填报中',
+ ytj:'已提交',
+ ywc:'已完成',
+ ywcfh:'已完成（经复核）',
+ ywc:'已完成',
+ dfz:'待废止',
+ yfz:'已废止',
+
 }

src/views/business/study/comp/tbbd/Bj.vue

@@ -198,7 +198,7 @@ export default {
           this.$modal.closeLoading()
         })
       } else {
-        this.form = row
+        this.form =  _.merge({}, this.form, row)
         this.open = true
       }
     },

src/views/business/study/comp/tbbd/Sh.vue

@@ -12,15 +12,17 @@ G