Browse Source

fix: 公告短信接口,财务接口,表单右上角按钮

linweizeng 3 years ago
parent
commit
5aed553005

+ 6 - 2
src/business/platform/form/formrender/dynamic-form/dynamic-form.vue

@@ -7,7 +7,7 @@
       <div v-if="hasHeader" class="title" style="font-size:22px; font-family:SimHei;"  :class="titlePosition">{{ formDef.name}}
       <span v-if="formDef && formDef.flowName">{{formDef.flowName}}</span>
       <relevance-table
-         v-if="titleList.length>0"
+         v-if="titleList.length>0 && formParams.formAttrs.customClass.indexOf('true') != -1"
          :list="titleList"
          :form ="form"
          />
@@ -290,6 +290,7 @@ export default {
     }) */
   },
   mounted() {
+
    this.titleList=[]
    this.StaOrRec=[]
    /*   form:{
@@ -613,7 +614,10 @@ export default {
     },
     //表单关联
     getTableList(list){
-          this.titleList = list
+      if (this.formDef.desc.indexOf('true') !== -1){
+        this.titleList = list
+      }
+
       },
       /* 将对象参数传入, 进行渲染 */
     getStatisOrRecord(type){

+ 11 - 3
src/business/platform/form/utils/custom/joinCURD.js

@@ -25,8 +25,8 @@ const post = (url, data) => {
   } else if (url == 'add') {
     pash = 'addDataContextTable'
   } else if (url == 'update') {
-    pash = 'updateDataContextTable' // 
-  } else if (url == 'updates') { //批量修改
+    pash = 'updateDataContextTable' //
+  } else if (url == 'updates') { // 批量修改
     pash = 'updateDatasContextTable'
   } else if (url == "sql") { //直接传入sql
     pash = 'inputSqlSelectData'
@@ -41,6 +41,12 @@ const post = (url, data) => {
   else if (url == "sendmessages") { //插入主管提醒数据
     pash = 'sendmessages'
   }
+  else if (url == "notice") { //插入公告短信
+    pash = 'sendNoticeMsg'
+  }
+  else if (url == "financial") { //插入财务短信
+    pash = 'sendFinancialMsg'
+  }
 
   if (typeof data == "object") {
     data = JSON.stringify(data)
@@ -63,8 +69,10 @@ const post = (url, data) => {
     requestData = data.slice(0, 1) + '"sig":"' + md5 + '",' + data.slice(1) //结果拼接
 
   }
+  let isMsg = ['sendNoticeMsg', 'sendFinancialMsg'].includes(pash)
+  let requestUrl = isMsg ? 'business/v3/hwsys/universal/' : 'business/v3/sys/universal/'
   return request({
-    url: 'business/v3/sys/universal/' + pash,
+    url: requestUrl + pash,
     method: 'post',
     data: requestData
   })