Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -2495,6 +2495,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         BeanUtil.copyProperties(commonContract,commonContractsVo,"sid");
         commonContractsVo.setContractSid(commonContract.getSid());
         commonContractsVo.setCreateDate(DateUtil.format(commonContract.getCreateDate(),"yyyy-MM-dd"));
+        commonContractsVo.setProcInsId(commonContract.getProcInstId());
         String urlPrefix = fileUploadComponent.getUrlPrefix();
         if (StringUtils.isNotBlank(commonContract.getAppdixUrl())) {
             String[] split1 = commonContract.getAppdixUrl().split(",");

anrui-buscenter/anrui-buscenter-ui/src/views/hetongguanli/hetongdanganguanli/hetongdanganguanliAdd.vue

@@ -207,7 +207,7 @@ export default {
       getOneContract(row.sid).then((res) => {
         if (res.success) {
           this.temp = res.data
-          this.temp.instanceId = res.data.procInstId
+          this.temp.instanceId = res.data.procInsId
           this.temp.userSid = window.sessionStorage.getItem('userSid')
           if (this.temp.contractImages.length > 0) {
             this.temp.contractImages.forEach((e) => {

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/hetongguanliFlow/hetongdanganguanli/hetongdanganEdit.vue

@@ -214,7 +214,7 @@ export default {
       getOneContract(row).then((res) => {
         if (res.success) {
           this.temp = res.data
-          this.temp.instanceId = res.data.procInstId
+          this.temp.instanceId = res.data.procInsId
           if (this.temp.contractImages.length > 0) {
             this.temp.contractImages.forEach((e) => {
               this.list1.push({
@@ -316,4 +316,9 @@ export default {
 }
 </script>
 <style scoped>
+.titwu {
+  font-size: 28px;
+  text-align: center;
+  padding: 30px 0 20px 0;
+}
 </style>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

@@ -322,7 +322,13 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         List<Map<String, Object>> nameList = new ArrayList<>();
         for (int i = 0; i < orgSidPathArr.length; i++) {
             Map<String, Object> m = new HashMap<>();
-            m.put("sid", orgSidPathArr[i]);
+            // app选择组织时 map 存值key要求这个是空字符串
+            if("fd6435f2-0005-11ec-a033-48452053aa33".equals(orgSidPathArr[i])){//河北安瑞集团的sid
+                m.put("sid", "");
+            }else{
+                m.put("sid", orgSidPathArr[i]);
+            }
+//            m.put("sid", orgSidPathArr[i]);
             m.put("name", selectOrgnameBySid(orgSidPathArr[i]));
             nameList.add(m);
         }

anrui-system-ui/src/api/system/postManage/index.js

@@ -76,3 +76,12 @@ export function selectList(data){
     params: data
   })
 }
+
+// 查询所有流程名称
+export function selectFlowList(){
+  return request({
+    url: '/flowable/v1/flow/selectFlowList',
+    method: 'get'
+  })
+}
+

anrui-system-ui/src/views/copyofprocess/liuchengchaosongAdd.vue

@@ -23,7 +23,7 @@
             <el-col :span="20">
               <el-form-item prop="flowName">
                 <el-select v-model="formobj.flowName" placeholder="请选择" @change="changeFlow" filterable>
-                  <el-option v-for="item in flow_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                  <el-option v-for="item in flow_list" :key="item.key" :label="item.name" :value="item.name"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -48,10 +48,10 @@
 
 <script>
 import { fetchSid, save, roleList } from '@/api/system/liuchengchaosong/liuchengchaosong'
-import { pullDown } from '@/api/system/postManage/index'
+import { selectFlowList } from '@/api/system/postManage/index'
 
 export default {
-  name: 'liuchengchaosongAdd',
+  name: 'LiuChengChaoSongAdd',
   data() {
     return {
       viewTitle: '',
@@ -81,7 +81,7 @@ export default {
           this.role_list = res.data
         }
       })
-      pullDown({ type: 'flow' }).then((res) => {
+      selectFlowList().then((res) => {
         if (res.success) {
           this.flow_list = res.data
         }
@@ -109,8 +109,8 @@ export default {
       })
     },
     changeFlow(value) {
-      const choose = this.flow_list.filter((item) => item.dictValue === value)
-      this.formobj.flowKey = choose[0].dictKey
+      const choose = this.flow_list.filter((item) => item.name === value)
+      this.formobj.flowKey = choose[0].key
     },
     save() {
       console.log(this.formobj)

anrui-system-ui/src/views/copyofprocess/liuchengchasongguanli.vue

@@ -9,7 +9,7 @@
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
               <el-form-item label="流程名称">
                 <el-select v-model="listQuery.params.flowName" placeholder="请选择" filterable>
-                  <el-option v-for="item in flow_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                  <el-option v-for="item in flow_list" :key="item.key" :label="item.name" :value="item.name"></el-option>
                 </el-select>
               </el-form-item>
             </el-form>
@@ -57,7 +57,7 @@
 
 <script>
 import { pageList, delBySids } from '@/api/system/liuchengchaosong/liuchengchaosong'
-import { pullDown } from '@/api/system/postManage/index'
+import { selectFlowList } from '@/api/system/postManage/index'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
@@ -121,7 +121,7 @@ export default {
   },
   methods: {
     init() {
-      pullDown({ type: 'flow' }).then((res) => {
+      selectFlowList().then((res) => {
         if (res.success) {
           this.flow_list = res.data
         }