feat：[试验管理]领取申请单

src/api/business/study/studyFormApply.js

@@ -33,7 +33,14 @@ export function studyFormApply_info(query) {
     params: query
   })
 }
-
+//导出
+export function studyFormApply_exportDetail(query) {
+  return request({
+    url: '/system/business/studyFormApply/exportDetail',
+    method: 'get',
+    params: query
+  })
+}
 //加签
 export function studyFormApply_jq(data) {
   return request({

src/api/business/study/studyFormPlan.js

@@ -33,7 +33,14 @@ export function studyFormPlan_info(query) {
     params: query
   })
 }
-
+//导出
+export function studyFormPlan_exportDetail(query) {
+  return request({
+    url: '/system/business/studyFormPlan/exportDetail',
+    method: 'get',
+    params: query
+  })
+}
 
 
 //更换归属人

src/components/Template/operation/TableOpertaionDelete.vue

@@ -0,0 +1,38 @@
+<template>
+    <div>
+        <el-popconfirm confirm-button-text='确认' cancel-button-text='取消' icon="el-icon-info" icon-color="red"
+            title="确认删除当前数据？" @confirm="deleteRow(rowIndex)">
+            <el-button  slot="reference" type="text" size="small" class="delete-button">
+                删除
+            </el-button>
+        </el-popconfirm>
+    </div>
+</template>
+
+<script>
+export default {
+    name: "TableOpertaionDelete",
+    props: {
+        row: {
+            type: Object,
+            default: () => { },
+        },
+        rowIndex: {
+            type: Number,
+            default: 0,
+        }
+    },
+    methods: {
+        // 删除行
+        deleteRow(index) {
+            this.$emit("deleteRow", index)
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.delete-button{
+  color: red;
+}
+</style>

src/views/business/comps/template/comps/gy/SYWZPZJHB.vue

@@ -12,10 +12,10 @@
 					<div class="template-form-item">
 						<BaseInfoFormPcakge  ref="stepFormPackageRef" :formConfig="stepFormConfig" @blur="onHandleBlur"
 							:formData="formData" />
-						<CustomTable @blur="onHandleTableBlur" :showHeaderSelect="fillType === 'actFill'" :showOperation="fillType === 'actFill'" ref="stepTableRef" :columns="stepColumns"
+						<CustomTable @blur="onHandleTableBlur" :showHeaderSelect="fillType === 'actFill'" :showAddRow="fillType === 'actFill'" :showOperation="fillType === 'actFill'" ref="stepTableRef" :columns="stepColumns"
 							:formData="formData" >
 							<template slot="operation" slot-scope="{ row, rowIndex}">
-								<TableOpertaion :fillType="fillType" :row="row" :rowIndex="rowIndex" @deleteRow="deleteRow"></TableOpertaion>
+								<TableOpertaionDelete  :row="row" :rowIndex="rowIndex" @deleteRow="deleteRow" ></TableOpertaionDelete>
 							</template>
 						</CustomTable>
 					</div>
@@ -23,7 +23,7 @@
 
 				</div>
 			</div>
-			<button @click="onSave">保存</button>
+			<!-- <button @click="onSave">保存</button> -->
 		</div>
 	</div>
 </template>
@@ -33,11 +33,11 @@ import BaseInfoFormPcakge from "@/components/Template/BaseInfoFormPcakge";
 import LineLabel from "@/components/Template/LineLabel";
 import templateMixin from "../../mixins/templateMixin";
 import CustomTable from '@/components/Template/CustomTable.vue';
-import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
+import TableOpertaionDelete from "@/components/Template/operation/TableOpertaionDelete.vue"
 
 export default {
 	name: "SYWZPZJHB",
-	components: { BaseInfoFormPcakge, LineLabel, CustomTable, TableOpertaion },		
+	components: { BaseInfoFormPcakge, LineLabel, CustomTable, TableOpertaionDelete },		
 	mixins: [templateMixin],
 	props: {
 		value: {
@@ -188,7 +188,7 @@ export default {
 	methods: {
 		//获取已填写的表单数据
 		getFilledFormData(){
-			return this.getFilledFormDataByRefs(["baseInfoRef", "storageConditionRef", "stepFormPackageRef", "stepRef", "remarkRef"])
+			return this.getFilledFormDataByRefs(["baseInfoRef","stepFormPackageRef",  "remarkRef","stepTableRef"])
 		},
 		async getFormData() {
 			return await this.validFormFields(["baseInfoRef", "stepFormPackageRef","stepTableRef","remarkRef"]);

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

@@ -145,6 +145,11 @@ export default {
       form: {},
       openSubmit: false,
       rulesApprove: {
+        fshryId: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
         qmrmm: [{
           required: true,
           message: ' ',

src/views/business/study/comp/jhbd/Xq.vue

@@ -14,18 +14,17 @@
       </div>
       <div class="edit-content ">
         <div class="content">
-          <div>
-            <el-button type="primary" @click="dcqbjcgj">{{ $t('page.business.study.studyFormPlan.dcqbjcgj') }}
-            </el-button>
-            <el-button type="primary" @click="dclcjcgj">{{ $t('page.business.study.studyFormPlan.dclcjcgj') }}
-            </el-button>
-            <el-button type="primary" @click="dcbjjcgj">{{ $t('page.business.study.studyFormPlan.dcbjjcgj') }}
-            </el-button>
-            <el-button type="primary" @click="dcxgjcgj">{{ $t('page.business.study.studyFormPlan.dcxgjcgj') }}
-            </el-button>
-            <el-button type="primary" @click="dcbhsjgj">{{ $t('page.business.study.studyFormPlan.dcbhsjgj') }}
-            </el-button>
-          </div>
+          <!-- 1:流程；3：编辑；5：人员；7：修改；9：补充说明 -->
+          <el-button type="primary" @click="exportExcel(-1)">{{ $t('page.business.study.studyFormPlan.dcqbjcgj') }}
+          </el-button>
+          <el-button type="primary" @click="exportExcel(1)">{{ $t('page.business.study.studyFormPlan.dclcjcgj') }}
+          </el-button>
+          <el-button type="primary" @click="exportExcel(3)">{{ $t('page.business.study.studyFormPlan.dcbjjcgj') }}
+          </el-button>
+          <el-button type="primary" @click="exportExcel(7)">{{ $t('page.business.study.studyFormPlan.dcxgjcgj') }}
+          </el-button>
+          <el-button type="primary" @click="exportExcel(999)">{{ $t('page.business.study.studyFormPlan.dcbhsjgj') }}
+          </el-button>
           <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="audit" :templateData="form" />
           <div class="content-title">
             <div class="line"></div>
@@ -43,28 +42,25 @@
                 :show-overflow-tooltip="true" />
             </el-table>
           </div>
-          <!-- <div class="pal">
+          <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-title">
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.study.studyFormPlan.jcgj') }}</div>
           </div>
           <JcgjList ref="jcgjList" @handleQuery="getJjcgjList" :showXg="true" />
-<!-- 
           <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
-            @pagination="getJjcgjList" /> -->
+            @pagination="getJjcgjList" />
         </div>
-
       </div>
     </div>
-
   </div>
 </template>
 
 <script>
-import { studyFormPlan_info, studyFormPlan_jcgj, studyFormPlan_qmxx } from "@/api/business/study/studyFormPlan"
+import { studyFormPlan_info, studyFormPlan_jcgj, studyFormPlan_qmxx, studyFormPlan_exportDetail } from "@/api/business/study/studyFormPlan"
 import { mapGetters } from 'vuex'
 import JcgjList from "@/views/business/comps/common/JcgjList";
 import TemplateTable from '@/views/business/comps/template/TemplateTable';
@@ -115,20 +111,14 @@ export default {
   created() {
   },
   methods: {
-    dcqbjcgj() {
-      alert('todo')
-    },
-    dclcjcgj() {
-      alert('todo')
-    },
-    dcbjjcgj() {
-      alert('todo')
-    },
-    dcxgjcgj() {
-      alert('todo')
-    },
-    dcbhsjgj() {
-      alert('todo')
+    exportExcel(jcgjlx) {
+      this.$modal.loading()
+      studyFormPlan_exportDetail(_.merge({}, this.queryParamsJcgj, { jcgjlx: jcgjlx, lang: this.$store.getters.language.split("_")[0] })).then(response => {
+        window.open(process.env.VUE_APP_FILE_DOMAIN + response.msg)
+        this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
     },
     getJjcgjList(val) {
       this.$modal.loading()

src/views/business/study/comp/sqbd/Xq.vue

@@ -17,15 +17,16 @@
       <div class="edit-content ">
         <div class="content">
           <div>
-            <el-button type="primary" @click="dcqbjcgj">{{ $t('page.business.study.studyFormApply.dcqbjcgj') }}
+            <!-- 1:流程；3：编辑；5：人员；7：修改；9：补充说明 -->
+            <el-button type="primary" @click="exportExcel(-1)">{{ $t('page.business.study.studyFormApply.dcqbjcgj') }}
             </el-button>
-            <el-button type="primary" @click="dclcjcgj">{{ $t('page.business.study.studyFormApply.dclcjcgj') }}
+            <el-button type="primary" @click="exportExcel(1)">{{ $t('page.business.study.studyFormApply.dclcjcgj') }}
             </el-button>
-            <el-button type="primary" @click="dcbjjcgj">{{ $t('page.business.study.studyFormApply.dcbjjcgj') }}
+            <el-button type="primary" @click="exportExcel(3)">{{ $t('page.business.study.studyFormApply.dcbjjcgj') }}
             </el-button>
-            <el-button type="primary" @click="dcxgjcgj">{{ $t('page.business.study.studyFormApply.dcxgjcgj') }}
+            <el-button type="primary" @click="exportExcel(7)">{{ $t('page.business.study.studyFormApply.dcxgjcgj') }}
             </el-button>
-            <el-button type="primary" @click="dcbhsjgj">{{ $t('page.business.study.studyFormApply.dcbhsjgj') }}
+            <el-button type="primary" @click="exportExcel(999)">{{ $t('page.business.study.studyFormApply.dcbhsjgj') }}
             </el-button>
           </div>
           <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form" fillType="audit" />
@@ -45,18 +46,18 @@
                 :show-overflow-tooltip="true" />
             </el-table>
           </div>
-          <!-- <div class="pal">
+          <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-title">
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.study.studyFormApply.jcgj') }}</div>
           </div>
           <JcgjList ref="jcgjList" @handleQuery="getJjcgjList" :showXg="true" />
 
-          <!-- <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
-            @pagination="getJjcgjList" /> -->
+          <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
+            @pagination="getJjcgjList" />
         </div>
 
       </div>
@@ -111,7 +112,7 @@
 </template>
 
 <script>
-import { studyFormApply_tb, studyFormApply_info, studyFormApply_jcgj, studyFormApply_qmxx } from "@/api/business/study/studyFormApply"
+import { studyFormApply_tb, studyFormApply_info, studyFormApply_jcgj, studyFormApply_qmxx, studyFormApply_exportDetail } from "@/api/business/study/studyFormApply"
 import { mapGetters } from 'vuex'
 import JcgjList from "@/views/business/comps/common/JcgjList";
 import TemplateTable from '@/views/business/comps/template/TemplateTable';
@@ -176,21 +177,14 @@ export default {
   created() {
   },
   methods: {
-
-    dcqbjcgj() {
-      alert('todo')
-    },
-    dclcjcgj() {
-      alert('todo')
-    },
-    dcbjjcgj() {
-      alert('todo')
-    },
-    dcxgjcgj() {
-      alert('todo')
-    },
-    dcbhsjgj() {
-      alert('todo')
+    exportExcel(jcgjlx) {
+      this.$modal.loading()
+      studyFormApply_exportDetail(_.merge({}, this.queryParamsJcgj, { jcgjlx: jcgjlx, lang: this.$store.getters.language.split("_")[0] })).then(response => {
+        window.open(process.env.VUE_APP_FILE_DOMAIN + response.msg)
+        this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
     },
     getJjcgjList(val) {
       this.$modal.loading()

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

@@ -25,55 +25,39 @@
       </el-button>
       <el-button type="primary" @click="exportExcel(999)">{{ $t('page.business.study.studyFormFill.dcbhsjgj') }}
       </el-button>
-       <!-- <el-button type="primary" @click="dcqbjcgj">{{ $t('page.business.study.studyFormFill.dcqbjcgj') }}
-        </el-button>
-        <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 class="edit-content ">
         <div class="content" style="width: 100%;">
-           <!-- <vue-html2pdf :show-layout="false" pdf-content-width="100%" :float-layout="false" pdf-orientation="landscape"
-            :enable-download="true" :preview-modal="true" ref="html2Pdf">  -->
-            <section slot="pdf-content">
-              <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form" fillType="detail" />
-              <div class="content-title">
-                <div class="line"></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="$i18n.locale === 'zh_CN' ? 'qmyy' : 'qmyyEn'" 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 class="content-title">
-                <div class="line"></div>
-                <div class="subtitle"> {{ $t('page.business.study.studyFormFill.jcgj') }}</div>
-              </div>
-              <JcgjList ref="jcgjList" @handleQuery="getJjcgjList" :showXg="true" />
-              <!-- 
-          <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
-            @pagination="getJjcgjList" /> -->
-            </section>
-<!-- 
-          </vue-html2pdf>  -->
+          <section slot="pdf-content">
+            <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form" fillType="detail" />
+            <div class="content-title">
+              <div class="line"></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="$i18n.locale === 'zh_CN' ? 'qmyy' : 'qmyyEn'" 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 class="content-title">
+              <div class="line"></div>
+              <div class="subtitle"> {{ $t('page.business.study.studyFormFill.jcgj') }}</div>
+            </div>
+            <JcgjList ref="jcgjList" @handleQuery="getJjcgjList" :showXg="true" />
+
+            <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
+              @pagination="getJjcgjList" />
+          </section>
         </div>
       </div>
     </div>
@@ -131,10 +115,9 @@ import { studyFormFill_tb, studyFormFill_info, studyFormFill_jcgj, studyFormFill
 import { mapGetters } from 'vuex'
 import JcgjList from "@/views/business/comps/common/JcgjList";
 import TemplateTable from '@/views/business/comps/template/TemplateTable';
-import VueHtml2pdf from 'vue-html2pdf'
 export default {
   name: "Xq",
-  components: { JcgjList, TemplateTable, VueHtml2pdf },
+  components: { JcgjList, TemplateTable },
   data() {
     return {
       openApprove: false,
@@ -194,8 +177,8 @@ export default {
   methods: {
     exportExcel(jcgjlx) {
       this.$modal.loading()
-      studyFormFill_exportDetail(_.merge({}, this.queryParamsJcgj, { jcgjlx: jcgjlx ,lang: this.$store.getters.language.split("_")[0]})).then(response => {
-        window.open(process.env.VUE_APP_FILE_DOMAIN  + response.msg)
+      studyFormFill_exportDetail(_.merge({}, this.queryParamsJcgj, { jcgjlx: jcgjlx, lang: this.$store.getters.language.split("_")[0] })).then(response => {
+        window.open(process.env.VUE_APP_FILE_DOMAIN + response.msg)
         this.$modal.closeLoading()
       }).finally(() => {
         this.$modal.closeLoading()