From fa2305764f9aa6902e4838c93ccb188287134c2f Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Wed, 31 Dec 2025 11:02:31 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A[=E8=AF=95=E9=AA=8C=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86]=E9=A2=84=E5=A1=AB=E8=A1=A8=E5=8D=95=E5=A1=AB?=
 =?UTF-8?q?=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                  |  77 ++++++++++++++
 src/api/business/study/studyFormPre.js       |  16 +++
 src/views/business/comps/common/JcgjList.vue |   8 +-
 src/views/business/study/comp/ytbd/Bj.vue    |  62 ++++++------
 src/views/business/study/comp/ytbd/Sh.vue    |  11 +-
 src/views/business/study/comp/ytbd/Xq.vue    | 146 +++++++++++++++++++++++++--
 src/views/business/study/comp/ytbdList.vue   |   4 +-
 7 files changed, 273 insertions(+), 51 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index edcb463..35895ed 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -371,6 +371,83 @@ export default {
     background: #ffffff;
     padding: 10px 10px;
     margin-top: 10px;
+     display: flex;
+    justify-content: center;
+    .content-right {
+      width: 33%;
+      margin-left: 2%;
+      padding: 0px 10px;
+      border-left: 1px solid #d0d0d0;
+    }
+
+    .content-left {
+      width: 65%;
+    }
+    .content {
+      width: 100%;
+    }
+
+    .content-title {
+      width: 100%;
+      background: #f9f9ff;
+      font-size: 0.96rem;
+      font-weight: bold;
+      padding-left: 10px;
+      height: 40px;
+      line-height: 40px;
+      display: flex;
+      justify-content: flex-start;
+      text-align: left;
+
+      .line {
+        width: 2px;
+        float: left;
+        height: 16px;
+        margin-top: 12px;
+        margin-right: 8px;
+        border-left: #3178ff 3px solid;
+      }
+
+      .subtitle {
+        height: 40px;
+        line-height: 40px;
+        color: #464647 !important;
+      }
+
+    }
+
+    .pal {
+
+      display: flex;
+      justify-content: space-between;
+      margin: 10px 0px;
+
+      .left {
+        box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
+        margin: 5px 5px 5px 0px;
+        width: 50%;
+        padding: 10px 10px;
+        border-radius: 5px 5px;
+
+        .left-title {
+          height: 40px;
+          line-height: 40px;
+        }
+      }
+
+      .right {
+        box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
+        margin: 5px 0px 5px 5px;
+        width: 50%;
+        padding: 10px 10px;
+        border-radius: 5px 5px;
+
+        .right-title {
+          height: 40px;
+          line-height: 40px;
+        }
+      }
+    }
   }
 }
 </style>
diff --git a/src/api/business/study/studyFormPre.js b/src/api/business/study/studyFormPre.js
index ab06478..a3ae38c 100644
--- a/src/api/business/study/studyFormPre.js
+++ b/src/api/business/study/studyFormPre.js
@@ -8,6 +8,22 @@ export function studyFormPre_list(query) {
     params: query
   })
 }
+//稽查轨迹
+export function studyFormPre_jcgj(query) {
+  return request({
+    url: '/system/business/studyFormPre/jcgjList',
+    method: 'get',
+    params: query
+  })
+}
+//签名信息
+export function studyFormPre_qmxx(query) {
+  return request({
+    url: '/system/business/studyFormPre/qmxxList',
+    method: 'get',
+    params: query
+  })
+}
 
 //详情
 export function studyFormPre_info(query) {
diff --git a/src/views/business/comps/common/JcgjList.vue b/src/views/business/comps/common/JcgjList.vue
index 31a5fde..bc9bb24 100644
--- a/src/views/business/comps/common/JcgjList.vue
+++ b/src/views/business/comps/common/JcgjList.vue
@@ -68,14 +68,14 @@ export default {
           item.jcnrList = []
         }
         // 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 
-        if (a.jcgjlx == 1) {
+        if (item.jcgjlx == 1) {
           item.color = '#409EFF'
         }
-        else if (a.jcgjlx == 3) {
+        else if (item.jcgjlx == 3) {
           item.color = '#F56C6C'
-        } else if (a.jcgjlx == 5) {
+        } else if (item.jcgjlx == 5) {
           item.color = '#67C23A'
-        } else if (a.jcgjlx == 7) {
+        } else if (item.jcgjlx == 7) {
           item.color = '#E6A23C'
         }
         tmp.push(item)
diff --git a/src/views/business/study/comp/ytbd/Bj.vue b/src/views/business/study/comp/ytbd/Bj.vue
index 41a25da..07c8f8f 100644
--- a/src/views/business/study/comp/ytbd/Bj.vue
+++ b/src/views/business/study/comp/ytbd/Bj.vue
@@ -8,14 +8,14 @@ G<template>
         </div>
         <div class="center-top">
           <div>
-            <div :class="showIndex == 1? 'el-step__icon is-text is-finish':'el-step__icon is-text is-info'">
+            <div :class="showIndex == 1 ? 'el-step__icon is-text is-finish' : 'el-step__icon is-text is-info'">
               <div class="el-step__icon-inner">1</div>
             </div>
             基础设置
           </div>
           <div class="line"></div>
           <div>
-            <div :class="showIndex == 2? 'el-step__icon is-text is-finish':'el-step__icon is-text is-info'">
+            <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>
             表单设计
@@ -33,34 +33,36 @@ G<template>
           </template>
         </div>
       </div>
-      <div class="edit-content ">
-        <el-form ref="form" :model="form" :rules="rules" label-width="120px" v-if="showIndex == 1">
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateId">
-                <SelectTemplate v-model="form.templateId" :name="form.templateMc" @change="selectTemplateChange" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.form.bdmc')" prop="bdmc">
-                <el-input type="text" v-model="form.bdmc" maxlength="50" :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="表单说明" prop="bdsm">
-                <el-input type="textarea" v-model="form.bdsm" :rows="5" maxlength="500"
-                  :placeholder="$t('form.placeholderInput')">
-                </el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <div v-else>
-          表单详情todo
+      <div class="edit-content">
+        <div class="content" style="width:60%">
+          <el-form ref="form" :model="form" :rules="rules" label-width="120px" v-if="showIndex == 1">
+            <el-row>
+              <el-col :span="24">
+                <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateId">
+                  <SelectTemplate v-model="form.templateId" :name="form.templateMc" @change="selectTemplateChange" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item :label="$t('page.business.form.bdmc')" prop="bdmc">
+                  <el-input type="text" v-model="form.bdmc" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="表单说明" prop="bdsm">
+                  <el-input type="textarea" v-model="form.bdsm" :rows="5" maxlength="500"
+                    :placeholder="$t('form.placeholderInput')">
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+          <div v-else>
+            表单详情todo
+          </div>
         </div>
       </div>
     </div>
diff --git a/src/views/business/study/comp/ytbd/Sh.vue b/src/views/business/study/comp/ytbd/Sh.vue
index c1780d3..0cc7c88 100644
--- a/src/views/business/study/comp/ytbd/Sh.vue
+++ b/src/views/business/study/comp/ytbd/Sh.vue
@@ -181,16 +181,13 @@ export default {
       this.form = {
         id: null,
         studyId: null,
-        bdbh: null,
-        bdmc: null,
-        bdsm: null,
-        templateId: null,
-        templateMc: null,
-        bdnr: null
+        qmyy: null,
+        remark: null,
+        qmrmm: null
       }
       this.resetForm("form")
     },
-    edit(row) {
+    show(row) {
       this.reset()
       this.$modal.loading()
       studyFormPre_info({ id: row.id }).then(response => {
diff --git a/src/views/business/study/comp/ytbd/Xq.vue b/src/views/business/study/comp/ytbd/Xq.vue
index f1c288d..e4dddd2 100644
--- a/src/views/business/study/comp/ytbd/Xq.vue
+++ b/src/views/business/study/comp/ytbd/Xq.vue
@@ -11,25 +11,125 @@ G<template>
         </div>
         <div class="right-top">
           <el-button @click="cancel()">{{ $t('form.cancel') }}</el-button>
-          <el-button type="primary" @click="save">填报</el-button>
+          <el-button type="primary" v-if="form.bdzt === 5&&form.tbzt === 1" @click="openApprove = true">填报</el-button>
         </div>
       </div>
       <div class="edit-content ">
-        表单详情todo
+        <div class="content-left">
+          <div class="content-title">
+            <div class="line"></div>
+            <div class="subtitle"> 表单内容</div>
+          </div>
+          todo
+          <div class="content-title">
+            <div class="line"></div>
+            <div class="subtitle"> 签名信息</div>
+          </div>
+          <div class="pal">
+            <el-table :data="qmxxList" v-loading="loadingQmxx">
+              <el-table-column label="签名人" align="center" prop="qmrMc" width="150px" />
+              <el-table-column label="签名意义" align="center" prop="qmyy" width="150px" />
+              <el-table-column label="签名时间" align="center" prop="createTime" width="150px" />
+              <el-table-column label="备注原因" 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"> 稽查轨迹</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="创建记录" :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="是否确定用该预填模板进行实际填报？" :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="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="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 { studyFormPre_tb, studyFormPre_info } from "@/api/business/study/studyFormPre"
+import { studyFormPre_tb, studyFormPre_info, studyFormPre_jcgj, studyFormPre_qmxx } from "@/api/business/study/studyFormPre"
 import { mapGetters } from 'vuex'
+import JcgjList from "@/views/business/comps/common/JcgjList";
 
 export default {
   name: "Xq",
-  components: {},
+  components: { JcgjList },
   data() {
     return {
+      openApprove: false,
+      formApprove: {
+        id: null,
+        qmyy: '创建记录',
+        remark: '',
+        qmrmm: '',
+      },
+      rulesApprove: {
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }]
+      },
+      qmxxList: [],
+      totalQmxx: 0,
+      loadingQmxx: true,
+      queryParamsQmxx: {
+        formId: null,
+        pageNum: 1,
+        pageSize: 10
+      },
       open: false,
       showIndex: 1,
       form: {},
@@ -45,6 +145,13 @@ export default {
           trigger: 'blur'
         }]
 
+      },
+      jcgjTotal: 0,
+      jcgjList: [],
+      queryParamsJcgj: {
+        pageNum: 1,
+        formId: null,
+        pageSize: 10,
       }
     }
   },
@@ -56,6 +163,23 @@ export default {
   created() {
   },
   methods: {
+    getJjcgjList(val) {
+      this.$modal.loading()
+      studyFormPre_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
+        this.jcgjList = response.rows
+        this.jcgjTotal = response.total
+        this.$refs.jcgjList.init(this.jcgjList)
+        this.$modal.closeLoading()
+      })
+    },
+    getQmxxList() {
+      this.loadingQmxx = true
+      studyFormPre_qmxx(this.queryParamsQmxx).then(response => {
+        this.qmxxList = response.rows
+        this.totalQmxx = response.total
+        this.loadingQmxx = false
+      })
+    },
     cancel() {
       this.$emit('close')
     },
@@ -72,21 +196,27 @@ export default {
       }
       this.resetForm("form")
     },
-    edit(row) {
+    show(row) {
       this.reset()
       this.$modal.loading()
+      this.formApprove.id = row.id
+      this.queryParamsJcgj.formId = row.id
+      this.queryParamsQmxx.formId = row.id
       studyFormPre_info({ id: row.id }).then(response => {
         this.form = response.data
         this.open = true
+        this.getQmxxList()
+        this.getJjcgjList()
         this.$modal.closeLoading()
       })
     },
-    save() {
-      this.$refs["form"].validate(valid => {
+    approve() {
+      this.$refs["formApprove"].validate(valid => {
         if (valid) {
           this.$modal.loading()
-          studyFormPre_tb(this.form).then(response => {
+          studyFormPre_tb(this.formApprove).then(response => {
             this.$emit('close')
+            this.openApprove = false
             this.$modal.closeLoading()
           })
         }
diff --git a/src/views/business/study/comp/ytbdList.vue b/src/views/business/study/comp/ytbdList.vue
index e115858..17b6732 100644
--- a/src/views/business/study/comp/ytbdList.vue
+++ b/src/views/business/study/comp/ytbdList.vue
@@ -218,12 +218,12 @@ export default {
     detail(row) {
       this.showDetail = true
       this.$emit('showDetail', this.showDetail)
-      this.$refs.Xq.edit(row)
+      this.$refs.Xq.show(row)
     },
     audit(row) {
       this.showAudit = true
       this.$emit('showDetail', this.showAudit)
-      this.$refs.Sh.edit(row)
+      this.$refs.Sh.show(row)
     },
   }
 }