feat: [试验管理] [填报表单] 页面修改

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

@@ -1,4 +1,5 @@
 export default {
+  //预填表单
   xzytbd: 'Create Form',
   bdmc: 'Record Name',
   bdbh: 'Record ID',
@@ -18,5 +19,25 @@ export default {
   statusWtg: 'Rejected',
 
   audit: 'Approve',
-  detail: 'Enter'
+  detail: 'Enter',
+  //填报表单
+  tjsj: 'Submit On',
+  sfwbl: 'Back Entry',
+  yes: 'Yes',
+  no: 'No',
+  xzbd: 'Create',
+  jq: 'Sign',
+  ghgsr: 'Change Owner',
+  fz: 'Abandon',
+  qrfz: 'Confirm',
+  fh: 'QC',
+  sy: 'Review',
+  gc: 'View',
+
+  statusBdTbz: 'On-going',
+  statusBdYtj: 'Submitted',
+  statusBdYwcJfh: 'Completed & Approved',
+  statusBdYwc: 'Completed',
+  statusBdDfz: 'Pending Abandon',
+  statusBdYfz: 'Abandoned'
 }

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

@@ -1,4 +1,5 @@
 export default {
+  //预填表单
   xzytbd: '新增预填表单',
   bdmc: '表单名称',
   bdbh: '表单编号',
@@ -18,5 +19,25 @@ export default {
   statusWtg: '未通过',
 
   audit: '审核',
-  detail: '表单详情'
+  detail: '表单详情',
+  //填报表单
+  tjsj: '提交时间',
+  sfwbl: '是否为补录',
+  yes: '是',
+  no: '否',
+  xzbd: '新增表单',
+  jq: '加签',
+  ghgsr: '更换归属人',
+  fz: '废止',
+  qrfz: '确认废止',
+  fh: '复核',
+  sy: '审阅',
+  gc: '观察',
+
+  statusBdTbz: '填报中',
+  statusBdYtj: '已提交',
+  statusBdYwcJfh: '已完成（经复核）',
+  statusBdYwc: '已完成',
+  statusBdDfz: '待废止',
+  statusBdYfz: '已废止'
 }

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

@@ -15,6 +15,7 @@
 
       <div class="content-box">
         <ytbd v-if="active==='ytbd'" :study="study" />
+        <tbbd v-if="active==='tbbd'" :study="study" />
       </div>
     </div>
   </div>
@@ -22,10 +23,11 @@
 
 <script>
 import ytbd from './ytbd.vue'
+import tbbd from './tbbd.vue'
 export default {
   name: 'StudyEnter',
   props: {},
-  components: {ytbd},
+  components: {ytbd,tbbd},
   computed: {},
   filters: {},
   data() {

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

@@ -0,0 +1,53 @@
+<template>
+  <div class="study-ytbd">
+    <div class="ytbd-left">
+      <sbject :study="study" />
+    </div>
+    <div class="ytbd-right">
+      <tbbdList :study="study" />
+    </div>
+  </div>
+</template>
+
+<script>
+import sbject from './suject.vue'
+import tbbdList from './tbbdList.vue'
+export default {
+  name: 'StudyTbbd',
+  props: {
+    study:{
+      type:Object,
+      default:()=>{
+        return {}
+      }
+    }
+  },
+  components: {sbject,tbbdList},
+  computed: {},
+  filters: {},
+  data() {
+    return {
+    }
+  },
+  created() {},
+  methods: {
+  }
+}
+</script>
+<style lang="scss" scoped>
+.study-ytbd {
+  display: flex;
+  flex-direction: row;
+  .ytbd-left {
+    background: #fff;
+    padding: 20px;
+    margin-right: 10px;
+    flex-shrink: 0;
+    width: 350px;
+  }
+  .ytbd-right{
+    flex-grow: 1;
+    overflow: hidden;
+  }
+}
+</style>

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

@@ -0,0 +1,219 @@
+<template>
+  <div class="ytbd-list">
+    <div class="ytbd-search">
+      <el-form :model="searchForm" ref="searchForm" :inline="true">
+        <el-form-item :label="$t('page.business.form.bdmc')" prop="name">
+          <el-input v-model="searchForm.name" :placeholder="$t('form.placeholderInput')" clearable style="width: 150px" @keyup.enter.native="search" />
+        </el-form-item>
+        <el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
+          <el-input v-model="searchForm.sn" :placeholder="$t('form.placeholderInput')" clearable style="width: 150px" @keyup.enter.native="search" />
+        </el-form-item>
+        <el-form-item :label="$t('page.business.form.gsr')" prop="ownerName">
+          <el-input v-model="searchForm.ownerName" :placeholder="$t('form.placeholderInput')" clearable style="width: 150px" @keyup.enter.native="search" />
+        </el-form-item>
+         <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
+          <el-input v-model="searchForm.templateName" :placeholder="$t('form.placeholderInput')" clearable style="width: 150px" @keyup.enter.native="search" />
+        </el-form-item>
+
+        <el-form-item :label="$t('page.business.form.cjsj')">
+          <el-date-picker v-model="daterange" clearable type="daterange" range-separator="-" :start-placeholder="$t('page.business.form.startDate')"
+            :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" @change="search" style="width: 220px" />
+        </el-form-item>
+
+        <el-form-item :label="$t('page.business.form.tjsj')">
+          <el-date-picker v-model="daterangeTj" clearable type="daterange" range-separator="-" :start-placeholder="$t('page.business.form.startDate')"
+            :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" @change="search" style="width: 220px" />
+        </el-form-item>
+
+        <el-form-item :label="$t('page.business.form.sfwbl')">
+          <el-select v-model="searchForm.sfwbl" clearable :placeholder="$t('form.placeholderSelect')" @change="search">
+            <el-option :label="$t('page.business.form.yes')" :value="10"></el-option>
+            <el-option :label="$t('page.business.form.no')" :value="1"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
+          <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
+        </el-form-item>
+        
+        <!-- <div>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
+            <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
+          </el-form-item>
+        </div> -->
+      </el-form>
+    </div>
+    <div class="ytbd-content">
+      <el-row class="add-box">
+        <el-col>
+          <el-button type="primary" icon="el-icon-plus" @click="edit(null)" v-hasPermi="['business:study:add']">{{ $t('page.business.form.xzytbd') }}</el-button>
+        </el-col>
+      </el-row>
+
+      <el-table v-loading="loading" :data="list">
+        <el-table-column :label="$t('page.business.form.bh')" prop="sn" />
+        <el-table-column :label="$t('page.business.form.bdmc')" prop="name" />
+        <el-table-column :label="$t('page.business.form.xtmbmc')" prop="templateName" />
+        <el-table-column :label="$t('page.business.form.cjsj')" align="center" prop="createTime" width="140" />
+        <el-table-column :label="$t('page.business.form.gsr')" align="center" prop="ownerName" width="100" />
+        <el-table-column :label="$t('page.business.form.sfwbl')" prop="sfwbl" width="100">
+          <template slot-scope="scope">
+            <span v-if="scope.row.sfwbl===1">{{$t('page.business.form.no')}}</span>
+            <span v-if="scope.row.sfwbl===10">{{$t('page.business.form.yes')}}</span>
+          </template>
+        </el-table-column>
+
+
+        <el-table-column :label="$t('page.business.form.status')" prop="status" width="100">
+          <template slot-scope="scope">
+            <span v-if="scope.row.status===1">{{$t('page.business.form.statusBdTbz')}}</span>
+            <span v-if="scope.row.status===3">{{$t('page.business.form.statusBdYtj')}}</span>
+            <span v-if="scope.row.status===5">{{$t('page.business.form.statusBdYwc')}}</span>
+            <span v-if="scope.row.status===7">{{$t('page.business.form.statusBdYwcJfh')}}</span>
+            <span v-if="scope.row.status===9">{{$t('page.business.form.statusBdDfz')}}</span>
+            <span v-if="scope.row.status===10">{{$t('page.business.form.statusBdYfz')}}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column :label="$t('page.business.form.tjsj')" align="center" prop="submitTime" width="140" />
+
+        
+        <el-table-column :label="$t('form.operate')" fixed="right" align="center" width="300">
+          <template slot-scope="scope">
+            <!-- 详情 -->
+            <el-button type="text" @click="detail(scope.row)" v-hasPermi="['business:study:detail']">{{$t('page.business.form.detail')}}</el-button>
+            <!-- 编辑 -->
+            <el-button type="text" @click="edit(scope.row)" v-hasPermi="['business:study:edit']" v-if="scope.row.status===1 || scope.row.status===5 || scope.row.status===7">{{$t('page.business.form.edit')}}</el-button>
+            <!-- 加签 -->
+            <el-button type="text" @click="jq(scope.row)" v-if="scope.row.status===1">{{$t('page.business.form.jq')}}</el-button>
+            <!-- 更换归属人 -->
+            <el-button type="text" @click="changeOwner(scope.row)" v-if="scope.row.status!==9 && scope.row.status!==10">{{$t('page.business.form.ghgsr')}}</el-button>
+            <!-- 废止 -->
+            <el-button type="text" @click="fz(scope.row)" v-if="scope.row.status===1">{{$t('page.business.form.fz')}}</el-button>
+            <!-- 复核 -->
+            <el-button type="text" @click="fh(scope.row)" v-if="scope.row.status===3">{{$t('page.business.form.fh')}}</el-button>
+            <!-- 审阅 -->
+            <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:study:audit']" v-if="scope.row.status===5 || scope.row.status===7">{{$t('page.business.form.sy')}}</el-button>
+            <!-- 观察 -->
+            <el-button type="text" @click="gc(scope.row)" v-hasPermi="['business:study:audit']" v-if="scope.row.status===1">{{$t('page.business.form.gc')}}</el-button>
+            <!-- 确认废止 -->
+            <el-button type="text" @click="qrfz(scope.row)" v-hasPermi="['business:study:audit']" v-if="scope.row.status===9">{{$t('page.business.form.qrfz')}}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="searchForm.pageNum"
+        :limit.sync="searchForm.pageSize"
+        @pagination="getList"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import {
+  study_list,
+  study_info,
+  study_save,
+  study_delete
+} from '@/api/business/study/study'
+export default {
+  name: 'TbbdList',
+  props: {
+    study:{
+      type:Object,
+      default:()=>{
+        return {}
+      }
+    }
+  },
+  components: {},
+  computed: {},
+  filters: {},
+  data() {
+    return {
+      daterange:[],
+      daterangeTj:[],
+      searchForm: {
+        pageNum: 1,
+        pageSize: 10,
+        sn:'',
+        name:'',
+        ownerName:'',
+        templateName:'',
+        startDate:'',
+        endDate:'',
+        tjStartDate:'',
+        tjEndDate:'',
+      },
+
+      loading: false,
+      total: 0,
+      list: [],
+    }
+  },
+  created() {},
+  methods: {
+    search(){
+
+    },
+    reset(){
+
+    },
+    getList(){
+
+    },
+    edit(row){
+
+    },
+    detail(row){
+
+    },
+    audit(row){
+
+    },
+    jq(row){
+
+    },
+    changeOwner(row){
+
+    },
+    fz(row){
+
+    },
+    fh(row){
+
+    },
+    gc(row){
+
+    },
+    qrfz(row){
+
+    },
+  }
+}
+</script>
+<style lang="scss" scoped>
+.ytbd-list {
+  .ytbd-search{
+    background: #fff;
+    padding: 20px;
+    margin-bottom: 10px;
+    .right-btn{
+      text-align:right
+    }
+  }
+  .ytbd-content{
+    padding: 20px;
+    background: #fff;
+    .add-box{
+      margin-bottom: 10px;
+    }
+  }
+}
+</style>

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

@@ -47,6 +47,7 @@ export default {
   }
   .ytbd-right{
     flex-grow: 1;
+    overflow: hidden;
   }
 }
 </style>

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

@@ -45,7 +45,7 @@
         <el-table-column :label="$t('page.business.form.bdmc')" prop="name" />
         <el-table-column :label="$t('page.business.form.xtmbmc')" prop="templateName" />
         <el-table-column :label="$t('page.business.form.cjsj')" align="center" prop="createTime" width="140" />
-        <el-table-column :label="$t('page.business.form.cjr')" align="center" prop="leaderName" width="100" />
+        <el-table-column :label="$t('page.business.form.cjr')" align="center" prop="ownerName" width="100" />
 
         <el-table-column :label="$t('page.business.form.status')" prop="status" width="100">
           <template slot-scope="scope">