代码上传

src/HManagement/siteManage/custom_option/index.vue

@@ -54,7 +54,7 @@ export default {
   },
   computed:{
     ...mapGetters({
-      acitveApp:'acitveApp',
+      activeApp:'activeApp',
     })
   },
   methods:{

src/SManagement/archives_sc/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="normal-card">
-    <p v-if="acitveApp" style="font-size:26px;font-weight:300;padding-bottom:16px">{{acitveApp.meta.title}}&nbsp;<i @click="addToAsideBar" style="color:#999" :class="showAppCollection()?'el-icon-star-on collection':'el-icon-star-off'"></i></p>
+    <p v-if="activeApp" style="font-size:26px;font-weight:300;padding-bottom:16px">{{activeApp.meta.title}}&nbsp;<i @click="addToAsideBar" style="color:#999" :class="showAppCollection()?'el-icon-star-on collection':'el-icon-star-off'"></i></p>
     <div class="header-panl">
       <!-- 搜索及分类筛选 -->
       <filterList @changeTypeId="changeTypeId" @startSearch="startSearch">
@@ -96,7 +96,7 @@ export default {
   },
   computed:{
     ...mapGetters({
-    acitveApp:'acitveApp',
+    activeApp:'activeApp',
     menuApp:'menuApp'
     })
   },
@@ -107,7 +107,7 @@ export default {
   },
   methods: {
     showAppCollection () {
-			let _isSame = this.menuApp.some(m=>this.acitveApp.name === m.systemapp)
+			let _isSame = this.menuApp.some(m=>this.activeApp.name === m.systemapp)
 			return _isSame
     },
     // 创建快捷应用
@@ -116,7 +116,7 @@ export default {
         "classname": "sysmanage.develop.userauthforweb.userauth",
         "method": "create_usershortcuts",
         "content": {
-          "systemappid":this.acitveApp.systemappid
+          "systemappid":this.activeApp.systemappid
         }
       })
       console.log(res);

src/components/newLayout/modules/aside.vue

@@ -154,8 +154,8 @@ export default {
   mounted () {
 
     let active_model = JSON.parse(sessionStorage.getItem('active_modules'))
-    if (sessionStorage.getItem('acitveApp')) {
-      let active_app = JSON.parse(sessionStorage.getItem('acitveApp'))
+    if (sessionStorage.getItem('activeApp')) {
+      let active_app = JSON.parse(sessionStorage.getItem('activeApp'))
       this.$store.dispatch('setActiveApp',{app:active_app,val:''})
     } else {
       this.$store.dispatch('setActiveApp',{app:active_model.apps[0],val:''})

src/components/newLayout/modules/header.vue

@@ -65,7 +65,7 @@ export default {
   methods:{
     // 选择登录账号
     selectAccount (item) {
-      let arr = ['module_info','acitveApp','active_modules','folderid']
+      let arr = ['module_info','activeApp','active_modules','folderid']
       arr.forEach(key=>{
         sessionStorage.removeItem(key)
       })

src/components/newLayout/modules/menu.vue

@@ -24,7 +24,7 @@ export default {
   },
   computed:{
     ...mapGetters({
-      acitveApp:'acitveApp',
+      activeApp:'activeApp',
       sys_modules:'sys_modules'
     })
   },
@@ -59,7 +59,7 @@ export default {
     this.setDefaultData()
   },
   watch:{
-    acitveApp (val) {
+    activeApp (val) {
       console.log(val,'-------')
       this.show = false
       setTimeout(() => {

src/components/normal-basic-layout/details/index.vue

@@ -4,7 +4,7 @@
       <div class="flex-align-center flex-between normal-margin">
         <div class="flex-align-center" style="flex:1 0 auto">
           <p style="font-size:30px;font-weight:300;margin-right:16px">{{titleText?titleText:'##'}}</p>
-          <tagTemp v-if="acitveApp.isdatatag" style="flex:1" ref="tag" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" @onSuccess="onSuccess"></tagTemp>
+          <tagTemp v-if="activeApp.isdatatag" style="flex:1" ref="tag" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" @onSuccess="onSuccess"></tagTemp>
         </div>
         <div class="flex-align-center">
           <cpEdit v-if="tool.checkAuth($route.name,'update')" :formPath="formPath" :oldFormPath="oldFormPath" :data="editData" btnType="default" @onAddSuccess="onSuccess"></cpEdit>
@@ -26,7 +26,8 @@
     </div>
     <div style="box-sizing: border-box;padding:10px">
       <el-row class="flex-align-stretch" :gutter="10">
-        <el-col style="flex:1;width:calc(100% - 400px)" :span="acitveApp.isdatateam?18:acitveApp.isdatafollowup?18:24">
+        <el-col style="flex:1;width:calc(100% - 400px)" :span="activeApp.isdatateam?18:activeApp.isdatafollowup?18:24">
+          <slot name="customBefore"></slot>
           <tabTemp :tabs="tabs" :editData="editData" :idname="idname" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" @onTabClick="onTabClick">
             <div :slot="'slot' + index" v-for="(tab,index) in tabs" :key="tab.index">
               <slot :name="'slot' + index"></slot>
@@ -35,8 +36,8 @@
           <slot name="custom"></slot>
         </el-col>
         <el-col style="width:400px;" :span="6">
-          <group v-if="acitveApp.isdatateam" ref="group" style="margin-bottom:10px" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" @onSuccess="onSuccess"></group>
-          <follow-up v-if="acitveApp.isdatafollowup" ref="follow" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)"></follow-up>
+          <group v-if="activeApp.isdatateam" ref="group" style="margin-bottom:10px" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" @onSuccess="onSuccess"></group>
+          <follow-up v-if="activeApp.isdatafollowup" ref="follow" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)"></follow-up>
         </el-col>
         
       </el-row>
@@ -75,7 +76,7 @@ export default {
   },
   computed:{
     ...mapGetters({
-      acitveApp:"acitveApp"
+      activeApp:"activeApp"
     })
   },
   components:{

src/components/normal-basic-layout/index.vue

@@ -4,7 +4,7 @@
       <div class="layout-header-panel container normal-panel">
         <div class="flex-align-center flex-between">
           <div class="normal-margin flex-align-center">
-            <div v-if="acitveApp" style="font-size:26px;font-weight:300">{{customTitle ? customTitle : acitveApp.meta.title}}&nbsp;
+            <div v-if="activeApp" style="font-size:26px;font-weight:300">{{customTitle ? customTitle : activeApp.meta.title}}&nbsp;
               <!-- <i v-if="!customTitle" @click="addToAsideBar" style="color:#999" :class="showAppCollection()?'el-icon-star-on collection':'el-icon-star-off'"></i> -->
               <div v-if="!customTitle" style="display:inline">
                 <img width="20" v-if="showAppCollection()" src="@/assets/icons/incoll.svg" alt="">
@@ -90,7 +90,7 @@ export default {
   },
   computed:{
     ...mapGetters({
-      acitveApp:'acitveApp',
+      activeApp:'activeApp',
       searchValue:'searchValue',
       menuApp:'menuApp',
     })
@@ -129,7 +129,7 @@ export default {
       val == '' && this.listData()
     },
     async listData () {
-      // console.log(this.acitveApp)
+      // console.log(this.activeApp)
       this.param.id = this.apiId.query
       const res = await this.$api.requested(this.param)
       this.list = res.data
@@ -215,13 +215,13 @@ export default {
         "classname": "sysmanage.develop.userauthforweb.userauth",
         "method": "create_usershortcuts",
         "content": {
-          "systemappid":this.acitveApp.systemappid
+          "systemappid":this.activeApp.systemappid
         }
       })
       this.$store.dispatch('setAppMenu')
     },
     showAppCollection () {
-			let _isSame = this.menuApp.some(m=>this.acitveApp.name === m.systemapp)
+			let _isSame = this.menuApp.some(m=>this.activeApp.name === m.systemapp)
 			return _isSame
 		},
     onHeaderSearch (key,val) {

src/components/normal-basic-layout/normal.vue

@@ -2,7 +2,7 @@
   <div class="basic__layout__panel">
     <div style="padding:16px 16px 0 16px;" class="flex-align-center flex-between" >
       <div class="flex-align-center ">
-        <div class="inline-16" v-if="acitveApp" style="font-size:26px;font-weight:300">{{customTitle ? customTitle : acitveApp.meta.title}}&nbsp;
+        <div class="inline-16" v-if="activeApp" style="font-size:26px;font-weight:300">{{customTitle ? customTitle : activeApp.meta.title}}&nbsp;
           <div v-if="!customTitle" style="display:inline">
             <img width="20" v-if="showAppCollection()" src="@/assets/icons/incoll.svg" alt="">
             <img width="20" v-else src="@/assets/icons/uncoll.svg" @click="addToAsideBar" alt="">
@@ -30,7 +30,7 @@ export default {
   },
   computed:{
     ...mapGetters({
-      acitveApp:'acitveApp',
+      activeApp:'activeApp',
       searchValue:'searchValue',
       menuApp:'menuApp',
     })
@@ -47,13 +47,13 @@ export default {
         "classname": "sysmanage.develop.userauthforweb.userauth",
         "method": "create_usershortcuts",
         "content": {
-          "systemappid":this.acitveApp.systemappid
+          "systemappid":this.activeApp.systemappid
         }
       })
       this.$store.dispatch('setAppMenu')
     },
     showAppCollection () {
-			let _isSame = this.menuApp.some(m=>this.acitveApp.name === m.systemapp)
+			let _isSame = this.menuApp.some(m=>this.activeApp.name === m.systemapp)
 			return _isSame
 		},
     refresh () {

src/components/print/index.vue

@@ -1,25 +1,54 @@
 <template>
   <div>
-    <el-button type="text" size="small" @click="queryPrintData">打 印</el-button>
+    <el-button type="text" size="small" @click="queryModelList">打 印</el-button>
+    <el-dialog append-to-body title="选择模板" :visible.sync="dialogTableVisible" width="400px">
+      <el-table size="mini" :data="gridData">
+        <el-table-column prop="modelname" label="模板名称"></el-table-column>
+        <el-table-column width="100" label="操作">
+          <template slot-scope="scope">
+            <el-button size="small" type="text" @click="selectMode(scope.row)">选择</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import {defaultElementTypeProvider, hiprint} from '@/index'
+// import {defaultElementTypeProvider, hiprint} from '@/index'
+import {mapGetters} from 'vuex'
 export default {
   props:['dataid'],
   data () {
     return {
+      gridData:[],
       panel:{},
-      printData:{}
+      printData:{},
+      sys_printmodelid:null,
+      dialogTableVisible:false
     }
   },
+  computed:{
+    ...mapGetters({
+      activeApp:'activeApp'
+    })
+  },
   methods:{
+    async queryModelList () {
+      this.dialogTableVisible = true
+      const res = await this.$api.requested({
+        "id": 20221121174201,
+        "content": { 
+          "systemappid":this.activeApp.systemappid
+        }
+      })
+      this.gridData = res.data
+    },
     async queryPrintData() {
       const res = await this.$api.requested({
         "id": 20221121174301,
         "content": { 
-          "sys_printmodelid": 22,
+          "sys_printmodelid": this.sys_printmodelid,
           "dataid":this.dataid
         }
       })
@@ -32,10 +61,13 @@ export default {
           this.printData[element.options.field] = res.data.data['dataset'+ element.options.sys_printdatasetid]
         }
       })
-      console.log(this.panel)
-      console.log(this.printData)
       this.onlyPrint()
     },
+    selectMode (row) {
+      this.sys_printmodelid = row.sys_printmodelid
+      this.dialogTableVisible = false
+      this.queryPrintData()
+    },
     onlyPrint() {
       let hiprintTemplate = this.$print(undefined, this.panel, this.printData, {}, {
         styleHandler: () => {

src/components/uploadBindMediaStock/modules/list.vue

@@ -140,11 +140,11 @@ export default {
         if (index === undefined) {
           let _isSame = this.fileRouter.some(m=>folder.attachmentid === m.attachmentid)
           _isSame?'':this.fileRouter.push(folder)
+          this.$emit('toFolderDetail',folder.attachmentid)
         } else {
           this.fileRouter = this.fileRouter.slice(0,index + 1)
         }
       }
-      this.$emit('toFolderDetail',folder.attachmentid)
     },
     restChecked () {
       this.list.forEach((e,index)=>{

src/store/index.js

@@ -19,7 +19,7 @@ export default new Vuex.Store({
     active_modules:{},
     checks:[],
     dataToForm:{},
-    acitveApp:null,
+    activeApp:null,
     appname:'',
     menuApp:[],
     sys_modules:[],
@@ -37,7 +37,7 @@ export default new Vuex.Store({
     active_modules:state => state.active_modules,
     checks:state => state.checks,
     dataToForm:state => state.dataToForm,
-    acitveApp:state => state.acitveApp,
+    activeApp:state => state.activeApp,
     appname:state => state.appname,
     menuApp:state => state.menuApp,
     searchValue:state => state.searchValue,
@@ -76,9 +76,9 @@ export default new Vuex.Store({
     },
     
     setActiveApp (state,data) {
-      data.app?sessionStorage.setItem('acitveApp',JSON.stringify(data.app)):''
+      data.app?sessionStorage.setItem('activeApp',JSON.stringify(data.app)):''
       state.appname = data.name
-      state.acitveApp = JSON.parse(sessionStorage.getItem('acitveApp'))
+      state.activeApp = JSON.parse(sessionStorage.getItem('activeApp'))
         //头部区域搜索所传入的数值
       state.searchValue = data.val
     },

src/views/printmodel/modules/add.vue

@@ -6,13 +6,13 @@
         <el-form-item label="模板名称">
           <el-input v-model="param.modelname" placeholder="输入模板名称"></el-input>
         </el-form-item>
-        <el-form-item label="应用ID">
+        <el-form-item label="应用">
           <!-- <el-input v-model="param.systemappid" placeholder="应用ID"></el-input> -->
           <el-select style="width:100%" v-model="param.systemappid" placeholder="请选择">
             <el-option
               v-for="item in applist"
               :key="item.systemappid"
-              :label="item.appname"
+              :label="item.systemappname"
               :value="item.systemappid">
             </el-option>
           </el-select>