fix：[试验管理][预填，填报，申请，计划]翻译

src/api/business/study/studyFormPlan.js

@@ -83,15 +83,6 @@ export function studyFormPlan_fhjj(data) {
   })
 }
 
-//通过
-export function studyFormPlan_tg(data) {
-  return request({
-    url: '/system/business/studyFormPlan/tg',
-    method: 'post',
-    data: data
-  })
-}
-
 //审阅
 export function studyFormPlan_sy(data) {
   return request({

src/lang/en/business/resource/resource.js

@@ -13,7 +13,7 @@ export default {
     jyz: 'Checked-out'
   },
   jlzt: {
-    wsd: '未锁定',
+    wsd: 'Unlocked',
     ysd: 'Locked',
     dgd: 'Pending Archiving',
     gd: 'Archived',

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

@@ -1,6 +1,6 @@
 export default {
  jcsz:'Setup',
- bdtb:'表单填报',
+ bdtb:'Form filling',
  xzbd:'Create',
  fh:'QC',
  jq:'Sign',
@@ -10,23 +10,22 @@ export default {
  qrfz:'Confirm',
  gc:'View',
  bdsm:'Description',
- zc:'暂存',
+ zc:'Save',
  next:'Next',
  save:'Save',
  pre:'Pre',
  submit:'Submit',
- bdnr:'表单内容',
- qmxx:'签名信息',
- qmr:'Signed By',
- qmyy:'签名意义',
- qmsj:'Date',
- bzyy:'备注原因',
+ qmxx: 'Signature Information',
+ qmr: 'Signed By',
+ qmyy: 'Purpose',
+ qmsj: 'Date',
+ bzyy: 'Comment',
  jcgj:'Track Record',
- cjjl:'创建记录',
+ cjjl:'Create',
  sfbl:'Is Back Entry',
  yes:'Yes',
  no:'No',
- tjjl:'提交记录',
+ tjjl:'Submit Record',
  sqfz:'申请废止',
  dcqbjcgj:'导出(全部稽查轨迹)',
  dclcjcgj:'导出(流程稽查轨迹)',
@@ -37,25 +36,24 @@ export default {
  tbz:'On-going',
  ytj:'Submitted',
  ywc:'Completed',
- wtg:'未通过',
+ wtg:'Rejected',
  yfh:'Approved',
  dfz:'Pending Abandon',
  yfz:'Abandoned',
 
- sh:'审核',
+ sh:'Approve',
  guancha:'View',
  jiaqian:'Sign',
  qrfz:'Confirm',
  reason:'Reason',
  reject:'Reject',
  approve:'Approve',
- szqk:'生长情况',
  rybg:'Change of Person',
  shenyue:'Review',
 
-fhjj:'复核拒绝',
-fhtg:'复核通过',
-shjj:'审核拒绝',
-shtg:'审核通过',
+fhjj:'Review rejected',
+fhtg:'Review approved',
+shjj:'Reject',
+shtg:'Approve',
 tongguo:'Approve',
 }

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

@@ -1,6 +1,6 @@
 export default {
  jcsz:'Setup',
- bdtb:'表单填报',
+ bdtb:'Form filling',
  xzbd:'Create',
  fh:'QC',
  jq:'Sign',
@@ -10,23 +10,22 @@ export default {
  qrfz:'Confirm',
  gc:'View',
  bdsm:'Description',
- zc:'暂存',
+ zc:'Save',
  next:'Next',
  save:'Save',
  pre:'Pre',
  submit:'Submit',
- bdnr:'表单内容',
- qmxx:'签名信息',
- qmr:'Signed By',
- qmyy:'签名意义',
- qmsj:'Date',
- bzyy:'备注原因',
+ qmxx: 'Signature Information',
+ qmr: 'Signed By',
+ qmyy: 'Purpose',
+ qmsj: 'Date',
+ bzyy: 'Comment',
  jcgj:'Track Record',
- cjjl:'创建记录',
+ cjjl:'Create',
  sfbl:'Is Back Entry',
  yes:'Yes',
  no:'No',
- tjjl:'提交记录',
+ tjjl:'Submit Record',
  sqfz:'申请废止',
  dcqbjcgj:'导出(全部稽查轨迹)',
  dclcjcgj:'导出(流程稽查轨迹)',
@@ -41,17 +40,16 @@ export default {
  dfz:'Pending Abandon',
  yfz:'Abandoned',
 
-guancha:'View',
+ guancha:'View',
  jiaqian:'Sign',
  qrfz:'Confirm',
  reason:'Reason',
  reject:'Reject',
  approve:'Approve',
-szqk:'生长情况',
-rybg:'Change of Person',
-shenyue:'Review',
-
-fhjj:'复核拒绝',
-fhtg:'复核通过',
-tongguo:'Approve',
+ szqk:'生长情况',
+ rybg:'Change of Person',
+ shenyue:'Review',
+ fhjj:'Review rejected',
+ fhtg:'Review approved',
+ tongguo:'Approve',
 }

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

@@ -1,56 +1,52 @@
 export default {
   jcsz: 'Setup',
-  bdtb: '表单填报',
+  bdtb: 'Preset Design',
   xzbd: 'Create',
   fh: 'QC',
   ghgsr: 'Change Owner',
   sy: 'Review',
   gc: 'View',
   bdsm: 'Description',
-  zc: '暂存',
- next:'Next',
- save:'Save',
- pre:'Pre',
- submit:'Submit',
-  bdnr: '表单内容',
-  qmxx: '签名信息',
+  zc: 'Save',
+  next:'Next',
+  save:'Save',
+  pre:'Pre',
+  submit:'Submit',
+  qmxx: 'Signature Information',
   qmr: 'Signed By',
-  qmyy: '签名意义',
-  qmsj: '签名时间',
-  bzyy: '备注原因',
+  qmyy: 'Purpose',
+  qmsj: 'Date',
+  bzyy: 'Comment',
   jcgj: 'Track Record',
-  cjjl: '创建记录',
-  xzpzjhb:'新增配置计划表',
+  xzpzjhb:'Create',
   yes:'Yes',
   no:'No',
-  shryId:'复核人员',
-  tjjl: '提交记录',
+  shryId:'QC User',
+  tjjl: 'Submit Record',
   dcqbjcgj: '导出(全部稽查轨迹)',
   dclcjcgj: '导出(流程稽查轨迹)',
   dcbjjcgj: '导出(编辑稽查轨迹)',
   dcxgjcgj: '导出(修改稽查轨迹)',
   dcbhsjgj: '导出(不含数据轨迹)',
   rybg: 'Change of Person',
-
   tbz: 'On-going',
-  ytj: '已Submitted提交',
+  ytj: 'Submitted',
   ywcfh: 'Completed & Approved',
   ywc: 'Completed',
-
   reject: 'Reject',
   reason: 'Reason',
   approve: 'Approve',
   shenyue: 'Review',
-  fhjj: '复核拒绝',
-  fhtg: '复核通过',
+  fhjj:'Review rejected',
+  fhtg:'Review approved',
   tongguo: 'Approve',
-  syxx: '试验信息',
+  syxx: 'Information',
   symc: 'Study Name',
   sybh: 'Study Number',
   syfzr: 'Study Director',
   cjsj: 'Creation Date',
   sdsy: 'Lock Study',
-  syjj: '试验简介',
-  xz: '新增配置计划表',
+  syjj: 'Description',
+  xz: 'Create',
   syxkxx: 'Discipline'
 }

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

@@ -2,33 +2,34 @@ export default {
  jcsz:'Setup',
  bdsj:'Preset Design',
  xzbd:'Create',
- zc:'暂存',
+ zc:'Save',
  next:'Next',
  save:'Save',
  submit:'Submit',
  bdsm:'Description',
- tjysb:'提交预设表',
- shryId:'审核人员',
+ tjysb:'Submit',
+ shryId:'Reviewer',
  fzrsh:'是否需要试验负责人审核',
  approve:'Approve',
  reject:'Reject',
- shtg:'审核通过',
- shjj:'审核拒绝',
+ shtg:'Approve',
+ shjj:'Reject',
  pre:'Pre',
  tb:'填报',
- bdnr:'表单内容',
- qmxx:'签名信息',
- qmr:'Signed By',
- qmyy:'签名意义',
- qmsj:'Date',
- bzyy:'备注原因',
+ qmxx: 'Signature Information',
+ qmr: 'Signed By',
+ qmyy: 'Purpose',
+ qmsj: 'Date',
+ bzyy: 'Comment',
  jcgj:'Track Record',
- cjjl:'创建记录',
+ cjjl:'Create',
  xjbd:'Create Preset',
- fzbdxz:'复制表单选择',
- sssyfsy:'所属试验/非试验',
+ fzbdxz:'Copy Existing Preset',
+ sssyfsy:'Study/Non-study',
  fzbd:'Copy Preset',
  yulan:'Preview',
  fzbj:'Copy and Edit',
  ts:'是否确定用该预填模板进行实际填报？',
+ cjxbd:'Create Preset',
+ fzyybd:'Copy Existing Preset',
 }

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

@@ -10,7 +10,7 @@ export default {
  qrfz:'确认废止',
  gc:'观察',
  bdsm:'表单说明',
- zc:'暂存',
+ zc:'Save',
  next:'下一步',
  pre:'上一步',
  save:'保存',

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

@@ -10,7 +10,7 @@ export default {
  qrfz:'确认废止',
  gc:'观察',
  bdsm:'表单说明',
- zc:'暂存',
+ zc:'Save',
  next:'下一步',
  pre:'上一步',
  save:'保存',

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

@@ -7,7 +7,7 @@ export default {
   sy: '审阅',
   gc: '观察',
   bdsm: '表单说明',
-  zc: '暂存',
+  zc: 'Save',
   next: '下一步',
  pre:'上一步',
   save: '保存',

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

@@ -2,7 +2,7 @@ export default {
  jcsz:'基础设置',
  bdsj:'表单设计',
  xzbd:'新增表单',
- zc:'暂存',
+ zc:'Save',
  next:'下一步',
  pre:'上一步',
  save:'保存',
@@ -32,4 +32,6 @@ export default {
  fzbj:'复制编辑',
  yulan:'预览',
  ts:'是否确定用该预填模板进行实际填报？',
+ cjxbd:'创建新表单',
+ fzyybd:'复制已有表单',
 }

src/views/business/study/comp/jhbd/Fh.vue

@@ -14,8 +14,6 @@
           }}</el-button>
           <el-button type="primary" @click="showApprove('复核通过')">{{ $t('page.business.study.studyFormPlan.fhtg')
           }}</el-button>
-          <el-button type="primary" @click="showApprove('通过')">{{ $t('page.business.study.studyFormPlan.tongguo')
-          }}</el-button>
         </div>
       </div>
       <div class="edit-content">
@@ -110,7 +108,7 @@
 </template>
 
 <script>
-import { studyFormPlan_fhtg, studyFormPlan_fhjj, studyFormPlan_tg, studyFormPlan_info, studyFormPlan_jcgj, studyFormPlan_qmxx } from "@/api/business/study/studyFormPlan"
+import { studyFormPlan_fhtg, studyFormPlan_fhjj,  studyFormPlan_info, studyFormPlan_jcgj, studyFormPlan_qmxx } from "@/api/business/study/studyFormPlan"
 import { mapGetters } from 'vuex'
 import JcgjList from "@/views/business/comps/common/JcgjList";
 import TemplateTable from '@/views/business/comps/template/TemplateTable';
@@ -211,9 +209,7 @@ export default {
         this.openTitle = 'page.business.study.studyFormPlan.fhtg'
       } else if (qmyy == '复核拒绝') {
         this.openTitle = 'page.business.study.studyFormPlan.fhjj'
-      } else if (qmyy == '通过') {
-        this.openTitle = 'page.business.study.studyFormPlan.tongguo'
-      }
+      } 
     },
     resetApprove() {
       this.resetForm("formApprove")
@@ -254,15 +250,7 @@ export default {
         }).finally(() => {
           this.$modal.closeLoading()
         })
-      } else {
-        studyFormPlan_tg(this.formApprove).then(response => {
-          this.openApprove = false
-          this.$modal.closeLoading()
-          this.$emit('close')
-        }).finally(() => {
-          this.$modal.closeLoading()
-        })
-      }
+      } 
     }
   }
 }

src/views/business/study/comp/jhbd/Sy.vue

@@ -212,9 +212,9 @@ export default {
       this.formApprove.bdnr = JSON.stringify(content)
       this.$modal.loading()
       studyFormPlan_sy(this.formApprove).then(response => {
-        this.$emit('close')
-        this.openSubmit = false
+        this.openApprove = false
         this.$modal.closeLoading()
+        this.$emit('close')
       }).finally(() => {
         this.$modal.closeLoading()
       })

src/views/business/study/comp/jhbd/Xq.vue

@@ -10,8 +10,6 @@
         </div>
         <div class="right-top">
           <el-button @click="cancel()">{{ $t('form.close') }}</el-button>
-          <el-button type="primary" v-if="form.bdzt === 5 && form.tbzt === 1" @click="openApprove = true">{{
-            $t('page.business.study.studyFormPlan.tb') }}</el-button>
         </div>
       </div>
       <div class="edit-content ">
@@ -62,56 +60,11 @@
       </div>
     </div>
 
-    <!-- 填报 -->
-    <el-dialog :title="$t('page.business.study.studyFormPlan.cjjl')" :visible.sync="openApprove" width="500px"
-      append-to-body :close-on-click-modal="false">
-      <el-form ref="formApprove" :model="formApprove" :rules="rulesApprove" label-width="120px">
-        <el-alert :title="$t('page.business.study.studyFormPlan.ts')" :closable="false" type="success">
-        </el-alert>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
-              <el-input type="text" :value="formApprove.qmyy" maxlength="50" disabled
-                :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="formApprove.remark" :rows="5" maxlength="500"
-                :placeholder="$t('form.placeholderInput')">
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.signer')">
-              <el-input type="text" v-model="nickName" maxlength="50" disabled
-                :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="formApprove.qmrmm" maxlength="20"
-                :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="approve">{{ $t('form.confirm') }}</el-button>
-        <el-button @click="openApprove = false">{{ $t('form.cancel') }}</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import { studyFormPlan_tb, studyFormPlan_info, studyFormPlan_jcgj, studyFormPlan_qmxx } from "@/api/business/study/studyFormPlan"
+import {  studyFormPlan_info, studyFormPlan_jcgj, studyFormPlan_qmxx } from "@/api/business/study/studyFormPlan"
 import { mapGetters } from 'vuex'
 import JcgjList from "@/views/business/comps/common/JcgjList";
 import TemplateTable from '@/views/business/comps/template/TemplateTable';
@@ -121,20 +74,6 @@ export default {
   components: { JcgjList, TemplateTable },
   data() {
     return {
-      openApprove: false,
-      formApprove: {
-        id: null,
-        qmyy: '创建记录',
-        remark: '',
-        qmrmm: '',
-      },
-      rulesApprove: {
-        qmrmm: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }]
-      },
       qmxxList: [],
       totalQmxx: 0,
       loadingQmxx: true,
@@ -176,7 +115,6 @@ export default {
   created() {
   },
   methods: {
-    
     dcqbjcgj() {
       alert('todo')
     },
@@ -230,7 +168,6 @@ export default {
     show(row) {
       this.reset()
       this.$modal.loading()
-      this.formApprove.id = row.id
       this.queryParamsJcgj.formId = row.id
       this.queryParamsQmxx.formId = row.id
       studyFormPlan_info({ id: row.id }).then(response => {
@@ -241,20 +178,6 @@ export default {
       }).finally(() => {
         this.$modal.closeLoading()
       })
-    },
-    approve() {
-      this.$refs["formApprove"].validate(valid => {
-        if (valid) {
-          this.$modal.loading()
-          studyFormPlan_tb(this.formApprove).then(response => {
-            this.$emit('close')
-            this.openApprove = false
-            this.$modal.closeLoading()
-          }).finally(() => {
-            this.$modal.closeLoading()
-          })
-        }
-      })
     }
   }
 }

src/views/business/study/comp/wzlb.vue

@@ -33,7 +33,6 @@
     <div class="syxx-content">
     </div>
 
-    <Sign ref="syxxSignRef" @callback="doSign" />
   </div>
 </template>
 

src/views/business/study/comp/ytbdList.vue

@@ -120,11 +120,11 @@
         <el-row>
           <el-col :span="24" style="text-align: center; margin-top: 50px;">
             <el-button type="primary" style="width: 80%; height: 40px;" @click="add" plain
-              icon="el-icon-circle-plus">创建新表单</el-button>
+              icon="el-icon-circle-plus">{{ $t('page.business.study.studyFormPre.cjxbd') }}</el-button>
           </el-col>
           <el-col :span="24" style="text-align: center; margin: 50px 0px;">
             <el-button type="primary" style="width: 80%;height: 40px;" @click="copy" plain
-              icon="el-icon-document-copy">复制已有表单</el-button>
+              icon="el-icon-document-copy">{{ $t('page.business.study.studyFormPre.fzyybd') }}</el-button>
           </el-col>
         </el-row>
       </el-form>
@@ -150,7 +150,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item>
-              <el-button type="primary" @click="previewFzbd" :disabled="!(formXz.formPreId)">预览</el-button>
+              <el-button type="primary" @click="previewFzbd" :disabled="!(formXz.formPreId)">{{ $t('page.business.study.studyFormPre.yulan') }}</el-button>
             </el-form-item>
           </el-col>
         </el-row>