Browse Source

获取电签列表增加参数

duy 1 năm trước cách đây
mục cha
commit
fb5c1f0955

+ 1 - 1
src/api/system/role.js

@@ -18,7 +18,7 @@ export const grantTree = () => {
   })
 }
 
-export const grant = (roleIds, menuIds, menuClientIds,menuArchivesIds,menuHacIds,menularIds, dataScopeIds, apiScopeIds, tableOwners) => {
+export const grant = (roleIds, menuIds, menuClientIds,menuArchivesIds,menuHacIds,menularIds,menuMeasureIds,menuSecureIds, dataScopeIds, apiScopeIds, tableOwners) => {
   return request({
     url: '/api/blade-system/role/grant',
     method: 'post',

+ 4 - 2
src/views/manager/projectinfo/independent.vue

@@ -97,7 +97,7 @@
                 <template slot-scope="{type,size,row}" slot="menu">
                       <el-button  :size="size" :type="type"  @click="Associationlist(row)">关联清表</el-button>
                       <el-button  :size="size" :type="type"  :disabled="row.excelIds == -1" @click="rightClick(row)">编辑元素</el-button>
-                      <el-button  :size="size" :type="type"  :disabled="row.excelIds == -1" @click="adjustExcel(row.id,row.primaryKeyId)">调整表单</el-button>
+                      <el-button  :size="size" :type="type"  :disabled="row.excelIds == -1" @click="adjustExcel(row.id,row.excelIds)">调整表单</el-button>
                       <el-button  :size="size" :type="type" @click="handleEditFormula(row)">编辑公式</el-button>
 
                 </template>
@@ -139,6 +139,7 @@
         @remove="removeExcel"
         v-if="excelHtml"
         :pkeyId="GLExcelFrom.id"
+        :excelId="GLExcelFrom.excelId"
       />
     </div>
 <!-- 元素公式 -->
@@ -713,11 +714,12 @@ export default {
       }
     },
       //#region 调整表单
-    adjustExcel(pkeyId) {
+    adjustExcel(pkeyId,excelIds) {
       console.log(pkeyId,'pkeyId');
       this.excelHtml=false;
       // //调整表单
       this.GLExcelFrom.id = pkeyId;
+      this.GLExcelFrom.excelId=excelIds
       this.getExcelHtml(pkeyId);
     },
     handleEditFormula(row) {

+ 2 - 0
src/views/manager/projectinfo/tree.vue

@@ -634,6 +634,7 @@
         @remove="removeExcel"
         v-if="excelHtml"
         :pkeyId="GLExcelFrom.id"
+        :excelId="GLExcelFrom.excelId"
       />
     </div>
 
@@ -3166,6 +3167,7 @@ export default {
     adjustExcel(pkeyId, excelId) {
       //调整表单
       this.GLExcelFrom.id = pkeyId;
+      this.GLExcelFrom.excelId=excelId
       this.getExcelHtml(pkeyId);
     },
     async getExcelHtml(pkeyId) {

+ 2 - 2
src/views/manager/projectinfo/treeTemplate/dynamicExcel.vue

@@ -32,7 +32,7 @@
             @change="change"
           />
         </span>
-        <span v-else-if="type.prop==='tab2'"> <electronicSignature :pkeyId1='pkeyId' :htmlData1="htmlData" /> </span>
+        <span v-else-if="type.prop==='tab2'"> <electronicSignature :pkeyId1='pkeyId' :htmlData1="htmlData" :excelId="excelId" /> </span>
         <span v-else-if="type.prop==='tab3'"> <setFormula :pkeyId1='pkeyId' :htmlData1="htmlData" /> </span>
         <span v-else-if="type.prop==='tab4'"> <editDefault :pkeyId1='pkeyId' :htmlData1="htmlData" /> </span>
         <span v-else-if="type.prop==='tab5'"> <promptSettings :pkeyId1='pkeyId' :htmlData1="htmlData" /> </span>
@@ -50,7 +50,7 @@ import promptSettings from './template/promptSettings.vue'
 import Vue from 'vue'
 import {getExcelHtml } from '@/api/exctab/excelmodel'
 export default {
-  props: ['pkeyId'],
+  props: ['pkeyId','excelId'],
   data () {
     return {
       setUptype: 0,//右侧显示的类型1

+ 4 - 2
src/views/manager/projectinfo/treeTemplate/template/electronicSignature.vue

@@ -137,7 +137,7 @@ import {findPfxType} from "../../../../../api/certificate/list";
 
 
 export default {
-  props: ['pkeyId1', 'htmlData1'],
+  props: ['pkeyId1', 'htmlData1','excelId'],
   data () {
     return {
       radio: '',
@@ -309,12 +309,14 @@ export default {
       }
     },
     async getSingInfo() {
+      console.log(this.excelId,'this.excelId1111111');
       const {data: res} = await getSigList(
         {
           current: 0,
           size: 100,
           tabId: this.pkeyId1,
-          type:2
+          type:2,
+          excelId:this.excelId
         }
       )
       if (res.code === 200) {