feat：[试验管理]预填表单关闭

src/api/business/study/studyFormPre.js

@@ -107,4 +107,32 @@ export function studyFormPre_updateBdnr(data) {
     method: 'post',
     data: data
   })
-}
+}
+
+//申请关闭
+export function studyFormPre_sqgb(data) {
+  return request({
+    url: '/system/business/studyFormPre/sqgb',
+    method: 'post',
+    data: data
+  })
+}
+
+//同意关闭
+export function studyFormPre_tygb(data) {
+  return request({
+    url: '/system/business/studyFormPre/tygb',
+    method: 'post',
+    data: data
+  })
+}
+
+//拒绝关闭
+export function studyFormPre_jjgb(data) {
+  return request({
+    url: '/system/business/studyFormPre/jjgb',
+    method: 'post',
+    data: data
+  })
+}
+

src/lang/en/business/form/form.js

@@ -18,6 +18,8 @@ export default {
   statusYtj: 'Submitted',
   statusYtg: 'Approved',
   statusWtg: 'Rejected',
+  statusDgb: '待关闭',
+  statusYgb: '已关闭',
 
   audit: 'Approve',
   detail: 'Enter',

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

@@ -35,5 +35,9 @@ export default {
   fzyybd: 'Copy Existing Preset',
   yes: 'Yes',
   no: 'No',
-  zztjyzbd: 'Submit Record Preset'
+  zztjyzbd: 'Submit Record Preset',
+  sqgb: '申请关闭',
+  qrgb: '确认关闭',
+  gbtgjj:'关闭通过/拒绝',
+  guanbi:'关闭'
 }

src/lang/zh/business/form/form.js

@@ -18,7 +18,9 @@ export default {
   statusYtj: '已提交',
   statusYtg: '已通过',
   statusWtg: '未通过',
-
+  statusDgb: '待关闭',
+  statusYgb: '已关闭',
+  
   audit: '审核',
   detail: '表单详情',
   //填报表单

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

@@ -36,5 +36,9 @@ export default {
   fzyybd: '复制已有表单',
   yes: '是',
   no: '否',
-  zztjyzbd: '制作提交预制表单'
+  zztjyzbd: '制作提交预制表单',
+  sqgb: '申请关闭',
+  qrgb: '确认关闭',
+  gbtgjj:'关闭通过/拒绝',
+  guanbi:'关闭'
 }

src/views/business/form/drug/comp/ytbdList.vue

@@ -71,6 +71,8 @@
               <span v-if="scope.row.bdzt === 1">{{ $t('page.business.form.statusTbz') }}</span>
               <span v-if="scope.row.bdzt === 3">{{ $t('page.business.form.statusYtj') }}</span>
               <span v-if="scope.row.bdzt === 5">{{ $t('page.business.form.statusYtg') }}</span>
+              <span v-if="scope.row.bdzt === 9">{{ $t('page.business.form.statusDgb') }}</span>
+              <span v-if="scope.row.bdzt === 11">{{ $t('page.business.form.statusYgb') }}</span>
             </template>
           </el-table-column>
 
@@ -102,6 +104,12 @@
                 <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:drugFormPre:sh']"
                   v-if="scope.row.bdzt === 3">{{ $t('page.business.form.audit') }}</el-button>
               </template>
+               <template v-if="scope.row.bdzt === 5&&id==scope.row.userId">
+                 <el-button type="text" @click="gb(scope.row)">{{ $t('page.business.study.studyFormPre.guanbi') }}</el-button>
+              </template>
+              <template v-if="scope.row.bdzt === 9&&id==scope.row.sjshryId">
+                 <el-button type="text" @click="qrgb(scope.row)">{{ $t('page.business.study.studyFormPre.qrgb') }}</el-button>
+              </template>
             </template>
           </el-table-column>
         </el-table>
@@ -116,6 +124,10 @@
     <Xq v-show="showDetail" key="Xq" ref="Xq" @close="xqClose" />
     <!-- 审核 -->
     <Sh v-show="showAudit" key="Sh" ref="Sh" @close="shClose" />
+    <!-- 关闭 -->
+    <Gb  key="Gb" ref="Gb" @callback="search" />
+    <!-- 确认关闭 -->
+    <Qrgb  key="Qrgb" ref="Qrgb" @callback="search" />
     <el-dialog :title="$t('page.business.study.studyFormPre.xjbd')" :visible.sync="open" width="500px" append-to-body
       :close-on-click-modal="false">
       <el-form ref="form" label-width="120px">
@@ -183,6 +195,8 @@ import TemplateTable from '@/views/business/comps/template/TemplateTable';
 import Bj from "@/views/business/study/comp/ytbd/Bj";
 import Xq from "@/views/business/study/comp/ytbd/Xq";
 import Sh from "@/views/business/study/comp/ytbd/Sh";
+import Gb from "@/views/business/study/comp/ytbd/Gb";
+import Qrgb from "@/views/business/study/comp/ytbd/Qrgb";
 import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
 import Sign from './sign.vue'
 import moment from "moment";
@@ -218,7 +232,7 @@ export default {
       deep: true
     }
   },
-  components: { Bj, Xq, Sh, SelectDeptUser, TemplateTable, Sign },
+  components: { Qrgb,Gb,Bj, Xq, Sh, SelectDeptUser, TemplateTable, Sign },
   data() {
     return {
       formCount: 0,
@@ -409,7 +423,12 @@ export default {
       this.$emit('showDetail', this.showAudit)
       this.$refs.Sh.show(row)
     },
-
+    gb(row) {
+      this.$refs.Gb.show(row)
+    },
+    qrgb(row) {
+      this.$refs.Qrgb.show(row)
+    },
     sdsy() {
       this.$modal.loading()
       drug_checkSd({

src/views/business/form/nonTrial/comp/ytbdList.vue

@@ -72,6 +72,8 @@
               <span v-if="scope.row.bdzt === 1">{{ $t('page.business.form.statusTbz') }}</span>
               <span v-if="scope.row.bdzt === 3">{{ $t('page.business.form.statusYtj') }}</span>
               <span v-if="scope.row.bdzt === 5">{{ $t('page.business.form.statusYtg') }}</span>
+              <span v-if="scope.row.bdzt === 9">{{ $t('page.business.form.statusDgb') }}</span>
+              <span v-if="scope.row.bdzt === 11">{{ $t('page.business.form.statusYgb') }}</span>
             </template>
           </el-table-column>
 
@@ -103,6 +105,12 @@
                 <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:nonTrialFormPre:sh']"
                   v-if="scope.row.bdzt === 3">{{ $t('page.business.form.audit') }}</el-button>
               </template>
+               <template v-if="scope.row.bdzt === 5&&id==scope.row.userId">
+                 <el-button type="text" @click="gb(scope.row)">{{ $t('page.business.study.studyFormPre.guanbi') }}</el-button>
+              </template>
+              <template v-if="scope.row.bdzt === 9&&id==scope.row.sjshryId">
+                 <el-button type="text" @click="qrgb(scope.row)">{{ $t('page.business.study.studyFormPre.qrgb') }}</el-button>
+              </template>
             </template>
           </el-table-column>
         </el-table>
@@ -117,6 +125,10 @@
     <Xq v-show="showDetail" key="Xq" ref="Xq" @close="xqClose" />
     <!-- 审核 -->
     <Sh v-show="showAudit" key="Sh" ref="Sh" @close="shClose" />
+    <!-- 关闭 -->
+    <Gb  key="Gb" ref="Gb" @callback="search" />
+    <!-- 确认关闭 -->
+    <Qrgb  key="Qrgb" ref="Qrgb" @callback="search" />
     <el-dialog :title="$t('page.business.study.studyFormPre.xjbd')" :visible.sync="open" width="500px" append-to-body
       :close-on-click-modal="false">
       <el-form ref="form" label-width="120px">
@@ -184,6 +196,8 @@ import TemplateTable from '@/views/business/comps/template/TemplateTable';
 import Bj from "@/views/business/study/comp/ytbd/Bj";
 import Xq from "@/views/business/study/comp/ytbd/Xq";
 import Sh from "@/views/business/study/comp/ytbd/Sh";
+import Gb from "@/views/business/study/comp/ytbd/Gb";
+import Qrgb from "@/views/business/study/comp/ytbd/Qrgb";
 import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
 import Sign from './sign.vue'
 import moment from "moment";
@@ -219,7 +233,7 @@ export default {
       deep: true
     }
   },
-  components: { Bj, Xq, Sh, SelectDeptUser, TemplateTable, Sign },
+  components: { Qrgb,Gb,Bj, Xq, Sh, SelectDeptUser, TemplateTable, Sign },
   data() {
     return {
       formCount: 0,
@@ -410,6 +424,12 @@ export default {
       this.$emit('showDetail', this.showAudit)
       this.$refs.Sh.show(row)
     },
+    gb(row) {
+      this.$refs.Gb.show(row)
+    },
+    qrgb(row) {
+      this.$refs.Qrgb.show(row)
+    },
     sdsy() {
       this.$modal.loading()
       nonTrial_checkSd({

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

@@ -340,7 +340,6 @@ export default {
         studyId: this.searchForm.studyId,
         formId:row.id
       }))
-      debugger
       this.$tab.openPage(row.bdmc, '/study/formFillBj/' +params)
     },
     bjClose() {

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

@@ -138,7 +138,7 @@
 </template>
 
 <script>
-import { studyFormPre_bc, studyFormPre_tj, studyFormPre_info,studyFormPre_updateBdnr } from "@/api/business/study/studyFormPre"
+import { studyFormPre_bc, studyFormPre_tj, studyFormPre_info, studyFormPre_updateBdnr } from "@/api/business/study/studyFormPre"
 import { mapGetters } from 'vuex'
 import SelectTemplate from "@/views/business/comps/select/SelectTemplate";
 import SelectStudyUser from '@/views/business/comps/select/SelectStudyUser';
@@ -263,7 +263,7 @@ export default {
         this.showIndex = 2
         this.$modal.loading()
         studyFormPre_info({ id: row.id }).then(response => {
-          this.form = response.data
+          this.form = _.merge({}, response.data, { permitForSecectUser: row.permitForSecectUser })
           this.form.qmyy = this.$t('page.business.study.studyFormPre.zztjyzbd')
           this.templateData = deepClone(this.form)
           this.$modal.closeLoading()

src/views/business/study/comp/ytbd/Gb.vue

@@ -0,0 +1,116 @@
+<template>
+  <div>
+    <el-dialog :title="$t('page.business.study.studyFormPre.sqgb')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <div class="sbzdtcma"> <input type="text"> <input type="password"> </div>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+              <el-input type="text" :value="form.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.reason')" prop="remark">
+              <el-input type="textarea" v-model="form.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="form.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="save">{{ $t('form.confirm') }}</el-button>
+        <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { studyFormPre_sqgb } from "@/api/business/study/studyFormPre"
+import { mapGetters } from 'vuex'
+
+export default {
+  name: "Sqgb",
+  components: {},
+  data() {
+    return {
+      isBatch: false,
+      ids: [],
+      selectList: [],
+      open: false,
+      form: {},
+      rules: {
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        remark: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName','name'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    cancel() {
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        id: null,
+        qmyy: this.$t('page.business.study.studyFormPre.sqgb'),
+        remark: null,
+        qmrmm: null
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      this.form.id = row.id
+      this.open = true
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          studyFormPre_sqgb(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
+        }
+      })
+    }
+  }
+}
+</script>

src/views/business/study/comp/ytbd/Qrgb.vue

@@ -0,0 +1,132 @@
+<template>
+  <div>
+    <el-dialog :title="$t('page.business.study.studyFormPre.qrgb')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <div class="sbzdtcma"> <input type="text"> <input type="password"> </div>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+              <el-input type="text" :value="form.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.reason')" prop="remark">
+              <el-input type="textarea" v-model="form.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="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer" style="text-align: center !important;">
+        <el-button type="danger" @click="reject">{{ $t('page.business.study.studyFormPre.reject') }}</el-button>
+        <el-button type="primary" @click="approve">{{ $t('page.business.study.studyFormPre.approve') }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { studyFormPre_tygb,studyFormPre_jjgb } from "@/api/business/study/studyFormPre"
+import { mapGetters } from 'vuex'
+
+export default {
+  name: "Qrfz",
+  components: {},
+  data() {
+    return {
+      isBatch: false,
+      ids: [],
+      selectList: [],
+      open: false,
+      form: {},
+      rules: {
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        remark: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName','name'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    cancel() {
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        id: null,
+        qmyy: this.$t('page.business.study.studyFormPre.gbtgjj'),
+        remark: null,
+        qmrmm: null
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      this.form.id = row.id
+      this.open = true
+    },
+    reject() {
+       this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.$modal.loading()
+          studyFormPre_jjgb(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
+        }
+      })
+    },
+    approve() {
+       this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.$modal.loading()
+          studyFormPre_tygb(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
+        }
+      })
+    }
+  }
+}
+</script>

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

@@ -69,6 +69,8 @@
               <span v-if="scope.row.bdzt === 3">{{ $t('page.business.form.statusYtj') }}</span>
               <span v-if="scope.row.bdzt === 5">{{ $t('page.business.form.statusYtg') }}</span>
               <span v-if="scope.row.bdzt === 7">{{ $t('page.business.form.statusWtg') }}</span>
+              <span v-if="scope.row.bdzt === 9">{{ $t('page.business.form.statusDgb') }}</span>
+              <span v-if="scope.row.bdzt === 11">{{ $t('page.business.form.statusYgb') }}</span>
             </template>
           </el-table-column>
 
@@ -100,6 +102,14 @@
                 <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:studyFormPre:sh']"
                   v-if="scope.row.bdzt === 3 && isMatchSubject">{{ $t('page.business.form.audit') }}</el-button>
               </template>
+              <template v-if="scope.row.bdzt === 5 && id == scope.row.userId">
+                <el-button type="text" @click="gb(scope.row)">{{ $t('page.business.study.studyFormPre.guanbi')
+                  }}</el-button>
+              </template>
+              <template v-if="scope.row.bdzt === 9 && id == scope.row.sjshryId">
+                <el-button type="text" @click="qrgb(scope.row)">{{ $t('page.business.study.studyFormPre.qrgb')
+                  }}</el-button>
+              </template>
             </template>
           </el-table-column>
         </el-table>
@@ -114,6 +124,11 @@
     <Xq v-show="showDetail" key="Xq" ref="Xq" @close="xqClose" />
     <!-- 审核 -->
     <Sh v-show="showAudit" key="Sh" ref="Sh" @close="shClose" />
+    <!-- 关闭 -->
+    <Gb key="Gb" ref="Gb" @callback="search" />
+    <!-- 确认关闭 -->
+    <Qrgb key="Qrgb" ref="Qrgb" @callback="search" />
+
     <el-dialog :title="$t('page.business.study.studyFormPre.xjbd')" :visible.sync="open" width="500px" append-to-body
       :close-on-click-modal="false">
       <el-form ref="form" label-width="120px">
@@ -178,6 +193,8 @@ import TemplateTable from '@/views/business/comps/template/TemplateTable';
 import Bj from "./ytbd/Bj";
 import Xq from "./ytbd/Xq";
 import Sh from "./ytbd/Sh";
+import Gb from "./ytbd/Gb";
+import Qrgb from "./ytbd/Qrgb";
 import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
 import moment from "moment";
 import { mapGetters } from 'vuex'
@@ -211,7 +228,7 @@ export default {
       deep: true
     }
   },
-  components: { Bj, Xq, Sh, SelectDeptUser, TemplateTable },
+  components: { Gb, Qrgb, Bj, Xq, Sh, SelectDeptUser, TemplateTable },
   data() {
     return {
       isMatchSubject: false,
@@ -378,7 +395,7 @@ export default {
     edit(row) {
       this.showEdit = true
       this.$emit('showDetail', this.showEdit)
-      this.$refs.Bj.edit(row)
+      this.$refs.Bj.edit(_.merge({}, row, { permitForSecectUser: 'business:studyFormPre:sh' }))
     },
     bjClose() {
       this.showEdit = false
@@ -400,6 +417,12 @@ export default {
       this.$emit('showDetail', this.showDetail)
       this.$refs.Xq.show(row, false)
     },
+    gb(row) {
+      this.$refs.Gb.show(row)
+    },
+    qrgb(row) {
+      this.$refs.Qrgb.show(row)
+    },
     audit(row) {
       this.showAudit = true
       this.$emit('showDetail', this.showAudit)