fix:[试验管理][试验方法]关闭

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

@@ -17,6 +17,9 @@ export default {
   qmsj: 'Date',
   qmyy: 'Meaning of Signature',
   remark: 'Comment',
+  ts: '',
+  gbts: 'This method has been closed, no need to read!',
+  jcyd: '坚持阅读',
   qyd:'Go Read',
   gb: 'Close',
   sfgb: 'Closed',

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

@@ -20,6 +20,8 @@ export default {
     qyd:'去阅读',
     gb: '关闭',
     sfgb: '是否关闭',
+    gbts: '该方法已关闭，无需阅读!',
+    jcyd: '坚持阅读',
     s: '是',
     f: '否',
     qrgb: '确认关闭?',

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

@@ -40,8 +40,8 @@
 
       </div>
       <div class="tbbd-content">
-        <el-row class="add-box">
-          <el-col v-ifan class="s">="searchForm.studyStatus < 5">
+        <el-row class="add-box" v-ifan class="s">="searchForm.studyStatus < 5">
+          <el-col>
             <el-button type="primary" icon="el-icon-plus" @click="add()" v-hasPermi="['business:studyMethod:upload']">{{
               $t('page.business.study.studyMethod.scff') }}</el-button>
           </el-col>
@@ -51,13 +51,19 @@
           <el-table-column :label="$t('page.business.study.studyMethod.ffmc')" prop="ffmc" />
           <el-table-column :label="$t('page.business.study.studyMethod.cjsj')" prop="createTime" />
           <el-table-column :label="$t('page.business.study.studyMethod.cjr')" prop="userMc" />
-          <el-table-column :label="$t('page.business.study.studyMethod.zt')" prop="status" align="center" width="100">
+          <el-table-column :label="$t('page.business.study.studyMethod.zt')" prop="status" align="center">
             <template slot-scope="scope">
               <span v-if="scope.row.zt != 0">{{ $t('page.business.study.studyMethod.yidu') }}</span>
               <span v-if="scope.row.zt === 0">{{ $t('page.business.study.studyMethod.weidu') }}</span>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('form.operate')" align="left" fixed="right" width="200">
+          <el-table-column :label="$t('page.business.study.studyMethod.sfgb')" prop="status" align="center">
+            <template slot-scope="scope">
+              <span v-if="scope.row.status === 1">{{ $t('page.business.study.studyMethod.s') }}</span>
+              <span v-if="scope.row.status === 10">{{ $t('page.business.study.studyMethod.f') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('form.operate')" align="left" fixed="right">
             <template slot-scope="scope" v-if="searchForm.studyStatus < 5">
               <!-- 阅读 -->
               <el-button type="text" @click="detail(scope.row)" v-hasPermi="['business:studyMethod:read']">{{
@@ -65,6 +71,10 @@
               <!-- 导出 -->
               <el-button type="text" @click="showExport(scope.row)" v-hasPermi="['business:studyMethod:download']">{{
                 $t('page.business.study.studyMethod.daochu') }}</el-button>
+              <!-- 关闭 -->
+              <el-button type="text" @click="handleSign(scope.row, 'page.business.study.studyMethod.gb')"
+                v-if="scope.row.userId == id && scope.row.status == 10">{{
+                  $t('page.business.study.studyMethod.gb') }}</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -76,15 +86,18 @@
     <!-- 新增 -->
     <Xz key="Xz" ref="Xz" @callback="search" />
     <!-- 详情 -->
-    <Xq key="Xq" ref="Xq" v-show="showDetail"  @close="xqClose" />
+    <Xq key="Xq" ref="Xq" v-show="showDetail" @close="xqClose" />
+    <!-- 签名 -->
+    <Sign ref="refSign" @callback="doSign" />
   </div>
 
 </template>
 
 <script>
-import { studyMethod_list } from '@/api/business/study/studyMethod'
+import { studyMethod_list, studyMethod_close } from '@/api/business/study/studyMethod'
 import Xz from "./syff/Xz";
 import Xq from "./syff/Xq";
+import Sign from "@/views/business/comps/common/sign";
 import { mapGetters } from 'vuex'
 import moment from "moment";
 export default {
@@ -117,7 +130,7 @@ export default {
       deep: true
     }
   },
-  components: { Xz, Xq },
+  components: { Xz, Xq, Sign },
   data() {
     return {
       showDetail: false,
@@ -135,6 +148,9 @@ export default {
         startDate: '',
         endDate: ''
       },
+      form: {
+        id: null,
+      },
       loading: false,
       total: 0,
       list: [],
@@ -143,7 +159,20 @@ export default {
   },
   created() { },
   methods: {
-
+    handleSign(row, qmyy) {
+      this.form.id = row.id
+      let title = this.$t(qmyy)
+      this.$refs.refSign.show(title, title, false, false, true, false)
+    },
+    doSign(val) {
+      let params = _.merge({}, this.form, val)
+      this.$modal.loading()
+      studyMethod_close(params).then(res => {
+        this.getList()
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
     search() {
       this.searchForm.pageNum = 1
       this.getList()
@@ -171,9 +200,19 @@ export default {
       this.$refs.Xz.show(this.study);
     },
     detail(row) {
-      this.showDetail = true
-      this.$emit('showDetail', this.showDetail)
-      this.$refs.Xq.show(row)
+      // 已关闭
+      if (row.status == 1) {
+        this.$modal.confirm(this.$t('page.business.study.studyMethod.gbts')).then(() => {
+          this.showDetail = true
+          this.$emit('showDetail', this.showDetail)
+          this.$refs.Xq.show(row)
+        }).catch(() => { });
+      } else {
+        this.showDetail = true
+        this.$emit('showDetail', this.showDetail)
+        this.$refs.Xq.show(row)
+      }
+
     },
     showExport(row) {
       this.showDetail = true

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

@@ -40,7 +40,7 @@
 
       </div>
       <div class="tbbd-content">
-        <el-row class="add-box"  v-if="searchForm.studyStatus < 5">
+        <el-row class="add-box" v-if="searchForm.studyStatus < 5">
           <el-col>
             <el-button type="primary" icon="el-icon-plus" @click="add()" v-hasPermi="['business:studyMethod:upload']">{{
               $t('page.business.study.studyMethod.scff') }}</el-button>
@@ -51,19 +51,19 @@
           <el-table-column :label="$t('page.business.study.studyMethod.ffmc')" prop="ffmc" />
           <el-table-column :label="$t('page.business.study.studyMethod.cjsj')" prop="createTime" />
           <el-table-column :label="$t('page.business.study.studyMethod.cjr')" prop="userMc" />
-          <el-table-column :label="$t('page.business.study.studyMethod.zt')" prop="status" align="center" >
+          <el-table-column :label="$t('page.business.study.studyMethod.zt')" prop="status" align="center">
             <template slot-scope="scope">
               <span v-if="scope.row.zt != 0">{{ $t('page.business.study.studyMethod.yidu') }}</span>
               <span v-if="scope.row.zt === 0">{{ $t('page.business.study.studyMethod.weidu') }}</span>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.study.studyMethod.sfgb')" prop="status" align="center" >
+          <el-table-column :label="$t('page.business.study.studyMethod.sfgb')" prop="status" align="center">
             <template slot-scope="scope">
               <span v-if="scope.row.status === 1">{{ $t('page.business.study.studyMethod.s') }}</span>
               <span v-if="scope.row.status === 10">{{ $t('page.business.study.studyMethod.f') }}</span>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('form.operate')" align="left" fixed="right" >
+          <el-table-column :label="$t('form.operate')" align="left" fixed="right">
             <template slot-scope="scope" v-if="searchForm.studyStatus < 5">
               <!-- 阅读 -->
               <el-button type="text" @click="detail(scope.row)" v-hasPermi="['business:studyMethod:read']">{{
@@ -202,8 +202,10 @@ export default {
     detail(row) {
       // 已关闭
       if (row.status == 1) {
-        this.$modal.confirm('该方法已关闭，无需阅读!').then(() => {
-
+        this.$modal.confirm(this.$t('page.business.study.studyMethod.gbts')).then(() => {
+          this.showDetail = true
+          this.$emit('showDetail', this.showDetail)
+          this.$refs.Xq.show(row)
         }).catch(() => { });
       } else {
         this.showDetail = true