From 6bca11903ec075eff52ecf95093057b12cd05355 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Thu, 1 Jan 2026 16:38:05 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E8=AF=95=E9=AA=8C=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86][=E5=A1=AB=E6=8A=A5=E8=A1=A8=E5=8D=95]=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lang/en.js                                     |   1 +
 src/lang/en/business/study/studyFormFill.js        |  13 ++-
 src/lang/zh.js                                     |   1 +
 src/lang/zh/business/study/studyFormFill.js        |  12 +-
 src/main.js                                        |   3 -
 .../business/resource/gyzj/comps/ffjlList.vue      |   1 +
 .../business/resource/gyzj/comps/gyzjList.vue      |   1 +
 src/views/business/resource/mjy/comps/ffjlList.vue |   1 +
 src/views/business/resource/mjy/comps/mjyList.vue  |   1 +
 src/views/business/study/comp/tbbd/Bj.vue          |  83 ++++---------
 src/views/business/study/comp/tbbd/Xq.vue          |  63 +++++++---
 src/views/business/study/comp/tbbdList.vue         | 130 ++++++++++++++-------
 vue.config.js                                      |   4 +-
 13 files changed, 192 insertions(+), 122 deletions(-)

diff --git a/src/lang/en.js b/src/lang/en.js
index 66eb617..2b0cb4a 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -56,6 +56,7 @@ export default {
     saveConfirm: 'Confirm',
     confirm: 'Confirm',
     cancel: 'Cancel',
+    close: 'Close',
     operate: 'Action',
     delete: 'Delete',
     detail: 'View',
diff --git a/src/lang/en/business/study/studyFormFill.js b/src/lang/en/business/study/studyFormFill.js
index dd475a4..73eaf03 100644
--- a/src/lang/en/business/study/studyFormFill.js
+++ b/src/lang/en/business/study/studyFormFill.js
@@ -1,6 +1,7 @@
 export default {
+
  jcsz:'基础设置',
- bdsj:'表单设计',
+ bdtb:'表单填报',
  xzbd:'新增表单',
  fh:'复核',
  jq:'加签',
@@ -22,4 +23,14 @@ export default {
  bzyy:'备注原因',
  jcgj:'稽查轨迹',
  cjjl:'创建记录',
+ sfbl:'是否为补录',
+ yes:'是',
+ no:'否',
+ tjjl:'提交记录',
+
+ dcqbjcgj:'导出(全部稽查轨迹)',
+ dclcjcgj:'导出(流程稽查轨迹)',
+ dcbjjcgj:'导出(编辑稽查轨迹)',
+ dcxgjcgj:'导出(修改稽查轨迹)',
+ dcbhsjgj:'导出(不含数据轨迹)',
 }
diff --git a/src/lang/zh.js b/src/lang/zh.js
index b8d693b..ba018e2 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -53,6 +53,7 @@ export default {
     saveConfirm: '确定',
     confirm: '确认',
     cancel: '取消',
+    close: '关闭',
     operate: '操作',
     delete: '删除',
     detail: '详情',
diff --git a/src/lang/zh/business/study/studyFormFill.js b/src/lang/zh/business/study/studyFormFill.js
index dd475a4..70958b1 100644
--- a/src/lang/zh/business/study/studyFormFill.js
+++ b/src/lang/zh/business/study/studyFormFill.js
@@ -1,6 +1,6 @@
 export default {
  jcsz:'基础设置',
- bdsj:'表单设计',
+ bdtb:'表单填报',
  xzbd:'新增表单',
  fh:'复核',
  jq:'加签',
@@ -22,4 +22,14 @@ export default {
  bzyy:'备注原因',
  jcgj:'稽查轨迹',
  cjjl:'创建记录',
+ sfbl:'是否为补录',
+ yes:'是',
+ no:'否',
+ tjjl:'提交记录',
+
+ dcqbjcgj:'导出(全部稽查轨迹)',
+ dclcjcgj:'导出(流程稽查轨迹)',
+ dcbjjcgj:'导出(编辑稽查轨迹)',
+ dcxgjcgj:'导出(修改稽查轨迹)',
+ dcbhsjgj:'导出(不含数据轨迹)',
 }
diff --git a/src/main.js b/src/main.js
index 379fb46..7eaf4dd 100644
--- a/src/main.js
+++ b/src/main.js
@@ -81,9 +81,6 @@ DictData.install()
 import i18n from './lang'
 
 import _ from 'lodash'
-import moment from "moment";
-// 将 moment 挂载到 Vue 原型上
-Vue.prototype.$moment = moment;
 Vue.use(Element, {
   i18n: (key, value) => i18n.t(key, value),
   size: Cookies.get('size') || 'mini' // set element-ui default size
diff --git a/src/views/business/resource/gyzj/comps/ffjlList.vue b/src/views/business/resource/gyzj/comps/ffjlList.vue
index 9eb9e68..bf85370 100644
--- a/src/views/business/resource/gyzj/comps/ffjlList.vue
+++ b/src/views/business/resource/gyzj/comps/ffjlList.vue
@@ -202,6 +202,7 @@ import Gd from "./ffjl/Gd";
 import Jd from "./ffjl/Jd";
 import Xq from "./ffjl/Xq";
 import Jq from "./ffjl/Jq";
+import moment from "moment";
 
 export default {
   name: "FfjlList",
diff --git a/src/views/business/resource/gyzj/comps/gyzjList.vue b/src/views/business/resource/gyzj/comps/gyzjList.vue
index 09df930..e7ca0ab 100644
--- a/src/views/business/resource/gyzj/comps/gyzjList.vue
+++ b/src/views/business/resource/gyzj/comps/gyzjList.vue
@@ -249,6 +249,7 @@ import Ff from "./gyzj/Ff";
 import Czrq from "./gyzj/Czrq";
 import Czyj from "./gyzj/Czyj";
 import Ysff from "./gyzj/Ysff";
+import moment from "moment";
 
 export default {
   name: "GyzjList",
diff --git a/src/views/business/resource/mjy/comps/ffjlList.vue b/src/views/business/resource/mjy/comps/ffjlList.vue
index 48f2b12..24a25aa 100644
--- a/src/views/business/resource/mjy/comps/ffjlList.vue
+++ b/src/views/business/resource/mjy/comps/ffjlList.vue
@@ -202,6 +202,7 @@ import Gd from "./ffjl/Gd";
 import Jd from "./ffjl/Jd";
 import Xq from "./ffjl/Xq";
 import Jq from "./ffjl/Jq";
+import moment from "moment";
 
 export default {
   name: "FfjlList",
diff --git a/src/views/business/resource/mjy/comps/mjyList.vue b/src/views/business/resource/mjy/comps/mjyList.vue
index e55a193..484447e 100644
--- a/src/views/business/resource/mjy/comps/mjyList.vue
+++ b/src/views/business/resource/mjy/comps/mjyList.vue
@@ -250,6 +250,7 @@ import Ff from "./mjy/Ff";
 import Czrq from "./mjy/Czrq";
 import Czyj from "./mjy/Czyj";
 import Ysff from "./mjy/Ysff";
+import moment from "moment";
 
 export default {
   name: "MjyList",
diff --git a/src/views/business/study/comp/tbbd/Bj.vue b/src/views/business/study/comp/tbbd/Bj.vue
index f052ecd..0488f31 100644
--- a/src/views/business/study/comp/tbbd/Bj.vue
+++ b/src/views/business/study/comp/tbbd/Bj.vue
@@ -18,7 +18,7 @@ G<template>
             <div :class="showIndex == 2 ? 'el-step__icon is-text is-finish' : 'el-step__icon is-text is-info'">
               <div class="el-step__icon-inner">2</div>
             </div>
-            {{ $t('page.business.study.studyFormFill.bdsj') }}
+            {{ $t('page.business.study.studyFormFill.bdtb') }}
           </div>
         </div>
         <div class="right-top">
@@ -53,6 +53,16 @@ G<template>
             </el-row>
             <el-row>
               <el-col :span="24">
+                <el-form-item :label="$t('page.business.study.studyFormFill.sfbl')" prop="sfbl">
+                  <el-radio-group v-model="form.sfbl">
+                    <el-radio :label="1">{{ $t('page.business.study.studyFormFill.no') }}</el-radio>
+                    <el-radio :label="10">{{ $t('page.business.study.studyFormFill.yes') }}</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
                 <el-form-item :label="$t('page.business.study.studyFormFill.bdsm')" prop="bdsm">
                   <el-input type="textarea" v-model="form.bdsm" :rows="5" maxlength="500"
                     :placeholder="$t('form.placeholderInput')">
@@ -63,69 +73,20 @@ G<template>
           </el-form>
         </div>
         <div class="content" v-show="showIndex == 2">
-          <TemplateTable ref="templateTable" sn="SP001" fillType="preFill" />
+          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="preFill" />
         </div>
       </div>
     </div>
 
-    <el-dialog :title="$t('page.business.study.studyFormFill.tjysb')" :visible.sync="openSubmit" width="500px"
+    <el-dialog :title="$t('page.business.study.studyFormFill.tjjl')" :visible.sync="openSubmit" width="500px"
       append-to-body :close-on-click-modal="false">
       <el-form ref="formSubmit" :model="form" :rules="rulesApprove" label-width="120px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('page.business.study.studyFormFill.shryId')" prop="shryId">
-              <SelectDeptUser v-model="form.shryId" :name="form.shryMc" key="shryId" @change="selectDeptUserChange" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('page.business.study.studyFormFill.shryId')" prop="fzrsh">
-              <el-radio-group v-model="form.fzrsh">
-                <el-radio :label="10">是</el-radio>
-                <el-radio :label="1">否</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <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.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.getReason" :rows="2" 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>
+        todo
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <!-- <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="tj">{{ $t('form.confirm') }}</el-button>
         <el-button @click="openSubmit = false">{{ $t('form.cancel') }}</el-button>
-      </div>
+      </div> -->
     </el-dialog>
   </div>
 </template>
@@ -173,7 +134,12 @@ export default {
           required: true,
           message: ' ',
           trigger: 'blur'
-        }]
+        }],
+        sfbl: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
 
       }
     }
@@ -212,6 +178,7 @@ export default {
         bdnr: null,
         fzrsh: null,
         shryId: null,
+        sfbl: null,
         shryMc: null,
       }
       this.resetForm("form")
@@ -248,7 +215,7 @@ export default {
     },
     async saveNext() {
       let content = await this.$refs.templateTable.getFormData()
-      this.form.bdnr=JSON.stringify(content)
+      this.form.bdnr = JSON.stringify(content)
       this.$modal.loading()
       studyFormFill_bc(this.form).then(response => {
         this.$emit('close')
@@ -264,7 +231,7 @@ export default {
     },
     async dotj() {
       let content = await this.$refs.templateTable.getFormData()
-      this.form.bdnr=JSON.stringify(content)
+      this.form.bdnr = JSON.stringify(content)
       this.$modal.loading()
       studyFormFill_tj(this.form).then(response => {
         this.$emit('close')
diff --git a/src/views/business/study/comp/tbbd/Xq.vue b/src/views/business/study/comp/tbbd/Xq.vue
index bc0b047..06a09ee 100644
--- a/src/views/business/study/comp/tbbd/Xq.vue
+++ b/src/views/business/study/comp/tbbd/Xq.vue
@@ -9,49 +9,62 @@ G<template>
         <div class="center-top">
         </div>
         <div class="right-top">
-          <el-button @click="cancel()">{{ $t('form.cancel') }}</el-button>
-          <el-button type="primary" v-if="form.bdzt === 5&&form.tbzt === 1" @click="openApprove = true">{{ $t('page.business.study.studyFormFill.tb') }}</el-button>
+          <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.studyFormFill.tb') }}</el-button>
         </div>
       </div>
       <div class="edit-content ">
-        <div class="content-left">
-          <div class="content-title">
-            <div class="line"></div>
-            <div class="subtitle"> {{  $t('page.business.study.studyFormFill.bdnr') }}</div>
+        <div class="content">
+          <div>
+            <el-button type="primary" @click="dcqbjcgj">{{ $t('page.business.study.studyFormFill.dcqbjcgj') }}
+            </el-button>
+            <el-button type="primary" @click="dclcjcgj">{{ $t('page.business.study.studyFormFill.dclcjcgj') }}
+            </el-button>
+            <el-button type="primary" @click="dcbjjcgj">{{ $t('page.business.study.studyFormFill.dcbjjcgj') }}
+            </el-button>
+            <el-button type="primary" @click="dcxgjcgj">{{ $t('page.business.study.studyFormFill.dcxgjcgj') }}
+            </el-button>
+            <el-button type="primary" @click="dcbhsjgj">{{ $t('page.business.study.studyFormFill.dcbhsjgj') }}
+            </el-button>
           </div>
-          todo
+          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="preFill" />
           <div class="content-title">
             <div class="line"></div>
-            <div class="subtitle"> {{  $t('page.business.study.studyFormFill.qmxx') }}</div>
+            <div class="subtitle"> {{ $t('page.business.study.studyFormFill.qmxx') }}</div>
           </div>
           <div class="pal">
             <el-table :data="qmxxList" v-loading="loadingQmxx">
-              <el-table-column :label="$t('page.business.study.studyFormFill.qmr')" align="center" prop="qmrMc" width="150px" />
-              <el-table-column :label="$t('page.business.study.studyFormFill.qmyy')" align="center" prop="qmyy" width="150px" />
-              <el-table-column :label="$t('page.business.study.studyFormFill.qmsj')" align="center" prop="createTime" width="150px" />
-              <el-table-column :label="$t('page.business.study.studyFormFill.bzyy')" align="center" prop="remark" :show-overflow-tooltip="true" />
+              <el-table-column :label="$t('page.business.study.studyFormFill.qmr')" align="center" prop="qmrMc"
+                width="150px" />
+              <el-table-column :label="$t('page.business.study.studyFormFill.qmyy')" align="center" prop="qmyy"
+                width="150px" />
+              <el-table-column :label="$t('page.business.study.studyFormFill.qmsj')" align="center" prop="createTime"
+                width="150px" />
+              <el-table-column :label="$t('page.business.study.studyFormFill.bzyy')" align="center" prop="remark"
+                :show-overflow-tooltip="true" />
             </el-table>
           </div>
           <div class="pal">
             <pagination v-show="totalQmxx > 0" :total="totalQmxx" :page.sync="queryParamsQmxx.pageNum"
               :limit.sync="queryParamsQmxx.pageSize" @pagination="getQmxxList" />
           </div>
-        </div>
-        <div class="content-right">
           <div class="content-title">
             <div class="line"></div>
-            <div class="subtitle"> {{  $t('page.business.study.studyFormFill.jcgj') }}</div>
+            <div class="subtitle"> {{ $t('page.business.study.studyFormFill.jcgj') }}</div>
           </div>
           <jcgjList ref="jcgjList" @handleQuery="getJjcgjList" />
 
           <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
             @pagination="getJjcgjList" />
         </div>
+
       </div>
     </div>
 
     <!-- 填报 -->
-    <el-dialog :title="$t('page.business.study.studyFormFill.cjjl')" :visible.sync="openApprove" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.study.studyFormFill.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.studyFormFill.ts')" :closable="false" type="success">
         </el-alert>
@@ -101,10 +114,11 @@ G<template>
 import { studyFormFill_tb, studyFormFill_info, studyFormFill_jcgj, studyFormFill_qmxx } from "@/api/business/study/studyFormFill"
 import { mapGetters } from 'vuex'
 import JcgjList from "@/views/business/comps/common/JcgjList";
+import TemplateTable from '@/views/business/comps/template/TemplateTable';
 
 export default {
   name: "Xq",
-  components: { JcgjList },
+  components: { JcgjList, TemplateTable },
   data() {
     return {
       openApprove: false,
@@ -162,6 +176,21 @@ export default {
   created() {
   },
   methods: {
+    dcqbjcgj() {
+      alert('todo')
+    },
+    dclcjcgj() {
+      alert('todo')
+    },
+    dcbjjcgj() {
+      alert('todo')
+    },
+    dcxgjcgj() {
+      alert('todo')
+    },
+    dcbhsjgj() {
+      alert('todo')
+    },
     getJjcgjList(val) {
       this.$modal.loading()
       studyFormFill_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
diff --git a/src/views/business/study/comp/tbbdList.vue b/src/views/business/study/comp/tbbdList.vue
index 177d649..cb0f152 100644
--- a/src/views/business/study/comp/tbbdList.vue
+++ b/src/views/business/study/comp/tbbdList.vue
@@ -1,35 +1,69 @@
 <template>
-  <div>
+ <div>
     <div class="tbbd-list" v-show="!showDetail && !showEdit && !showAudit">
       <div class="tbbd-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.bdmc" :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.bdbh" :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="userId">
-            <SelectDeptUser v-model="searchForm.userId" :name="searchForm.userMc" key="userId" @change="userChange" />
-          </el-form-item>
-          <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
-            <el-input v-model="searchForm.templateMc" :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>
-            <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>
+        <el-form :model="searchForm" ref="searchForm" :inline="true" label-width="100px">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item :label="$t('page.business.form.bdmc')" prop="name">
+                <el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
+                  style="width: 200px" @keyup.enter.native="search" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
+                <el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
+                  style="width: 200px" @keyup.enter.native="search" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="$t('page.business.form.gsr')" prop="userId">
+                <SelectDeptUser v-model="searchForm.userId" style="width: 200px" :name="searchForm.userMc" key="userId"
+                  @change="userChange" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item>
+                <div style="margin-left: 100px;">
+                  <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>
+                </div>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
+                <el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
+                  style="width: 200px" @keyup.enter.native="search" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <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: 200px" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <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: 200px" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="$t('page.business.study.studyFormFill.sfbl')">
+                <el-select v-model="searchForm.sfbl" :placeholder="$t('form.placeholderSelect')" clearable
+                  @change="search">
+                  <el-option :label="$t('page.business.study.studyFormFill.yes')" :value="10" />
+                  <el-option :label="$t('page.business.study.studyFormFill.no')" :value="1" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
       </div>
       <div class="tbbd-content">
@@ -45,17 +79,22 @@
           <el-table-column :label="$t('page.business.form.bdmc')" prop="bdmc" />
           <el-table-column :label="$t('page.business.form.xtmbmc')" prop="templateMc" />
           <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="userMc" width="100" />
-
-          <el-table-column :label="$t('page.business.form.status')" prop="status" width="100">
+          <el-table-column :label="$t('page.business.form.gsr')" align="center" prop="userMc" width="100" />
+          <el-table-column :label="$t('page.business.form.status')" prop="status"  align="center" width="100">
             <template slot-scope="scope">
               <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>
             </template>
           </el-table-column>
-
-          <el-table-column :label="$t('form.operate')" fixed="right" align="center" width="200">
+          <el-table-column :label="$t('page.business.study.studyFormFill.sfbl')"  align="center" prop="status" width="100">
+            <template slot-scope="scope">
+              <span v-if="scope.row.bdzt === 10">{{ $t('page.business.study.studyFormFill.yes') }}</span>
+              <span v-if="scope.row.bdzt === 1">{{ $t('page.business.study.studyFormFill.no') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.form.tjsj')" align="center" prop="tjsj" width="140" />
+          <el-table-column :label="$t('form.operate')" align="left" fixed="right" width="200">
             <template slot-scope="scope">
               <!-- 详情 -->
               <el-button type="text" @click="detail(scope.row)" v-hasPermi="['business:studyFormFill:xq']">{{
@@ -111,6 +150,7 @@ import Xq from "./tbbd/Xq";
 import Sh from "./tbbd/Sh";
 import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
 import { mapGetters } from 'vuex'
+import moment from "moment";
 export default {
   name: 'YtbdList',
   props: {
@@ -145,6 +185,7 @@ export default {
       showAudit: false,
       showEdit: false,
       showDetail: false,
+      daterangetj: [],
       daterange: [],
       searchForm: {
         pageNum: 1,
@@ -156,8 +197,10 @@ export default {
         userId: '',
         userMc: '',
         templateMc: '',
-        startDate: '',
-        endDate: '',
+        cjsjjs: '',
+        cjsjks: '',
+        tjsjjs: '',
+        tjsjks: '',
       },
 
       loading: false,
@@ -181,11 +224,18 @@ export default {
     },
     getList() {
       if (this.daterange != null && this.daterange.length > 0) {
-        this.searchForm.startDate = this.daterange[0]
-        this.searchForm.endDate = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
+        this.searchForm.cjsjks = this.daterange[0]
+        this.searchForm.cjsjjs = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
+      } else {
+        this.searchForm.cjsjks = ''
+        this.searchForm.cjsjjs = ''
+      }
+      if (this.daterangetj != null && this.daterangetj.length > 0) {
+        this.searchForm.tjsjks = this.daterangetj[0]
+        this.searchForm.tjsjjs = moment().add(this.daterangetj[1], 'days').format('YYYY-MM-DD');
       } else {
-        this.searchForm.startDate = ''
-        this.searchForm.endDate = ''
+        this.searchForm.tjsjks = ''
+        this.searchForm.tjsjjs = ''
       }
       this.loading = true
       studyFormFill_list(this.searchForm).then(response => {
diff --git a/vue.config.js b/vue.config.js
index 054942f..d3ce99c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -34,8 +34,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-         target: `http://localhost:8080`,
-        //target: `http://39.99.251.173:8080`,
+        // target: `http://localhost:8080`,
+        target: `http://39.99.251.173:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''