提交代码

 Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue

@@ -670,11 +670,11 @@
                                    tip: '默认空着，设置后表示强制显示这样的高度',
                                    tipPlacement: 'right',
                                    span: 7,
                                    rules:[{
                                        validator: validateNumber,
                                        message: "窗口显示的高度必须为数值类型",
                                        trigger: "blur",
                                    }]
                                    // rules:[{
                                    //     validator: validateNumber,
                                    //     message: "窗口显示的高度必须为数值类型",
                                    //     trigger: "blur",
                                    // }]
                                },{
                                    label: '过滤(级联)属性',
                                    prop: 'useFormKey',

 Source/UBCS-WEB/src/views/code/code.vue

@@ -779,6 +779,7 @@
        ref="referConfigFormDialog"
        @echoReferConfig="echoReferConfig">
      </refer-config-form-dialog>
      
      <!-- 第二层对话框,直接选择参照配置crud组件 -->
      <refer-config-crud-dialog
        ref="referConfigCrudDialog"
@@ -1117,6 +1118,7 @@
          //转换成JSON字符串进行父组件回显
          let submitFormJson = JSON.stringify(content);
          this.form.referConfig = submitFormJson;
          this.form.referValueInfo = submitFormJson;
        },
        /** 引用码段为【参照引用的业务类型】选取值之后的内容回显时调用 */
        echoReferBtmType(content){
@@ -2589,6 +2591,7 @@
              referBtmId: row!=null&&row.referBtmId != '' ? row.referBtmId:'',   //参照引用的业务类型，的id
              referBtmName: row!=null&&row.referBtmName != '' ? row.referBtmName:'', //参照引用的业务类型
              referConfig: row!=null&&row.referConfig != '' ? row.referConfig:'',  //参照配置
              referValueInfo: row!=null&&row.referValueInfo != '' ? row.referValueInfo:'',  //参照配置
            });
          }else if(this.form.secType==='codedatesec'){
            //日期码段

 Source/UBCS-WEB/src/views/system/user.vue

@@ -801,10 +801,10 @@
    selChange(row){
      this.id=row
    },
    selecload(page, params = {}) {
      getPage(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res => {
        console.log(res)
        this.seoptions=res.data.data.content
    selecload() {
      getPage(1, -1).then(res => {
        // console.log(res)
        this.seoptions=res.data.data.records
      });
    },
    nodeClick(data) {

 Source/UBCS-WEB/vue.config.js

@@ -26,13 +26,13 @@
    proxy: {
      '/api': {
        //本地服务接口地址
        // target: 'http://localhost:37000',
        target: 'http://localhost:37000',
        // target: 'http://192.168.1.51:37000',
        // target: 'http://192.168.1.46:37000',
        // target: 'http://192.168.1.104:37000',
        // target: 'http://192.168.1.63:37000',
        // target: 'http://192.168.3.7:37000',
        target: 'http://dev.vci-tech.com:37000',
        // target: 'http://dev.vci-tech.com:37000',
        // target: 'http://192.168.1.51:37000/',
        // target:'http://192.168.1.104:37000',
        // 远程演示服务地址,可用于直接启动项目

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java

@@ -32,11 +32,6 @@
     */
    private static final long serialVersionUID = 957685333614390234L;

//    /**
//     * 租户ID
//     */
//    private String tenantId;

    /**
     * 参照的业务类型
     */

 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/service/RevisionModelUtil.java

@@ -68,7 +68,8 @@
                    }

                    if (StringUtils.isNotBlank(wrapperOptions.getParentFieldName())) {
                        tree.setParentId(VciBaseUtil.getStringValueFromObject(VciBaseUtil.getValueFromField(wrapperOptions.getParentFieldName(), doObject)));
                        String stringValueFromObject = VciBaseUtil.getStringValueFromObject(VciBaseUtil.getValueFromField(wrapperOptions.getParentFieldName(), doObject));
                        tree.setParentId(stringValueFromObject);
                    }

                    if (wrapperOptions.isAllAttributes()) {

 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/UITableCustomDefineVO.java

@@ -15,6 +15,7 @@
     * 序列化
     */
    private static final long serialVersionUID = 431728683965836558L;

    /**
     * 主键
     */

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java

@@ -267,7 +267,6 @@
                //JSONObject.parseObject(codeBasicSecDO.getReferConfig(), UIFormReferVO.class);
                codeReferConfigVO = JSONObject.parseObject(codeBasicSecDO.getReferConfig(), CodeReferConfigVO.class);
                // 将参照配置进行持久化，给用户提供可可选择参照配置的方式

            }catch (Throwable e){
                throw new VciBaseException("引用码段的时候，参照配置的内容的格式不正确,",new String[0],e);
            }

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java

@@ -129,7 +129,6 @@
        VciBaseUtil.alertNotNull(codeRuleDTO, "需要添加的数据对象");
        //将DTO转换为DO
        CodeRule codeRule = Objects.requireNonNull(BeanUtil.copy(codeRuleDTO, CodeRule.class));
        String userId = AuthUtil.getUserId().toString();
        DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeRule, MdmBtmTypeConstant.CODE_RULE);
        codeRule.setLctid(CODE_RULE_LC);
        codeRule.setLcStatus(FRAMEWORK_RELEASE_EDITING);
@@ -438,7 +437,6 @@
        boolean exFlag1 = this.codeBasicSecService.saveBatch(codeBasicSecs);
        return R.data(exFlag&&exFlag1);
    }


    /**
     * 使用主键获取编码规则的内容

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java