田源
2023-09-12 ade4735384aa2b35f54799c64973342d6ab76b9a
码值申请-层级码段默认值 树节点id
已修改6个文件
81 ■■■■ 文件已修改
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/FormTemplate/index.vue 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/Master/MasterTree.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/views/MasterData/items.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -84,10 +84,15 @@
    trendsSpan: {
      type: Number,
      default: 8,
    }
    },
    TreeValue:{
      type: String,
      default: "",
    },
  },
  data() {
    return {
      TreeValueForm:'',
      updateIndex: 0,
      form: {},
      option: {
@@ -114,7 +119,7 @@
      slotColumnList: [],
    };
  },
  mounted() {
    mounted() {
    this.handleResize();
  },
  computed: {
@@ -126,10 +131,31 @@
        return 24 / Math.floor(windowWidth / 500);
      }
    },
  },
  watch: {
    // 表单数据修改反馈到父组件
    form: {
      deep: true,
      immediate: true,
      handler(newV) {
        this.$emit("getFormData", newV);
      },
    },
    TreeValue:{
      handler(newval,oldval){
        if(newval){
          this.TreeValueForm=newval;
          // console.log(this.TreeValueForm)
        }
      },
      deep:true,
      immediate:true
    }
  },
  methods: {
    // 渲染表单模板
    templateRender(formItemList) {
    templateRender(formItemList,TreeValue) {
      // 无需分组数据
      let column = [];
      let group = [];
@@ -138,7 +164,6 @@
      let value=''
      formItemList.forEach((formItem) => {
        formItem = this.resetFormConfig(formItem);
        // console.log('formItem',formItem)
        // console.log('formItem.dicData.value',formItem.dicData)
        if (formItem.type === "line") {
          group.push({
@@ -196,7 +221,7 @@
          format: formItem.dateFormate,
          keyAttr: formItem.keyAttr,
          value: (formItem.dicData && formItem.dicData.length > 0 && formItem.secType == "codefixedsec" ? formItem.dicData[0].id : null) ||
            (formItem.secType == "codedatesec"?formItem.codeDateFormatStr: null),
            (formItem.secType == "codedatesec"?formItem.codeDateFormatStr: null) || ( TreeValue&& formItem.secType == "codelevelsec" ? TreeValue : null),
          placeholder: formItem.inputTip,
          comboxKey: formItem.comboxKey,
          tip: formItem.tooltips,
@@ -415,16 +440,6 @@
        this.$emit("getFormData", this.form);
        this.$emit("referConfigDataUpdate", data);
      }
    },
  },
  watch: {
    // 表单数据修改反馈到父组件
    form: {
      deep: true,
      immediate: true,
      handler(newV) {
        this.$emit("getFormData", newV);
      },
    },
  },
};
Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -13,6 +13,7 @@
    <FormTemplate
      v-bind="$attrs"
      :type="type"
      :TreeValue="TreeValue"
      :rowOid="rowOid"
      :templateOid="templateOid"
      v-if="dialogVisible"
@@ -90,6 +91,10 @@
    visible: {
      type: Boolean,
      default: false,
    },
    TreeValue:{
      type: String,
      default: "",
    },
    type: {
      type: String,
@@ -291,7 +296,7 @@
            that.showCodeApply = true;
            that.activeName = "codeApply";
            that.$nextTick(() => {
              that.$refs.CodeApply.templateRender(that.secVOList);
              that.$refs.CodeApply.templateRender(that.secVOList,this.TreeValue);
            });
          } else {
            that.showCodeApply = false;
@@ -319,7 +324,7 @@
        }
        return item;
      });
      this.$refs.CodeApply.templateRender(this.secVOList);
      this.$refs.CodeApply.templateRender(this.secVOList,this.TreeValue);
    },
    resembleQuerySubmit() {
      this.activeName = "resembleQuery";
Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -28,6 +28,7 @@
  },
  data() {
    return {
      TreeValue:'',
      idData: '',
      masterVrBtnList: [],
      tableHeadFindData: [],
@@ -165,6 +166,9 @@
    //树点击事件
    async nodeClick(data) {
      try {
        console.log(data)
        this.TreeValue=data.label.split(" ")[0].trim();
        this.$emit('TreeValue',this.TreeValue)
        this.nodeClickList = data;
        this.tableHeadDataFateher = []
        this.tableHeadFindData = []
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -54,7 +54,7 @@
          </el-row>
          <!--          新增-->
          <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
                              :disabledProp="disabledProp" :templateOid="templateOid" :visible.sync="addvisible"
                              :disabledProp="disabledProp" :templateOid="templateOid" :visible.sync="addvisible" :TreeValue="TreeValue"
                              type="add"
                              @submit="AddSumbit">
          </FormTemplateDialog>
@@ -155,6 +155,10 @@
    tableDataArray: {
      type: Array,
    },
    TreeValue:{
      type: String,
      default: "",
    },
    total: {
      type: String,
      default: "",
Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
@@ -64,7 +64,7 @@
      </el-form-item>
<!--      查询按钮-->
      <el-form-item size="small" v-if="shouldShowButton">
        <el-button type="success" size="small">查询</el-button>
        <el-button type="success" size="small" @click="handleSearch">查询</el-button>
      </el-form-item>
    </el-form>
  </div>
@@ -117,9 +117,12 @@
    },
    SaveHandler(){
      let name = this.SearchObject.searchData[this.formInline.type].prop;
      getList(this.page.currentPage, this.page.pageSize, {[name]: this.formInline.text}).then(res => {
      getList(this.page.currentPage, this.page.pageSize, { [`conditionMap['${name}_like']`]: this.formInline.text}).then(res => {
        console.log(res);
      });
    },
    handleSearch(){
      console.log(this.formInline.Date)
    }
  }
}
Source/UBCS-WEB/src/views/MasterData/items.vue
@@ -6,7 +6,7 @@
        <master-tree @codeClassifyOid="codeClassifyOidList" @coderuleoid="coderuleoidList" :pageSize="this.pageSize"
          :currentPage="this.currentPage" @tableDataArray="tableDataArrays" @tableHeadDataFateher="tableHeadDatas"
          @tableHeadBttoms="tableHeadBttoms" @total="totals" @nodeClick="nodeClick"
          @tableHeadFindData="tableHeadFindDatas" @Treedata="TreedataList"></master-tree>
          @tableHeadFindData="tableHeadFindDatas" @Treedata="TreedataList" @TreeValue="TreeValueEmit"></master-tree>
      </basic-container>
    </el-aside>
    <el-main>
@@ -14,7 +14,7 @@
      <VciMasterCrud :page="this.page" :codeClassifyOid="this.codeClassifyOid" :coderuleoid="this.coderuleoid"
        @pageSize="pageSizes" @currentPage="currentPages" :tableDataArray="tableDataArray" :total="this.total"
        :tableHeadDataFateher="this.tableHeadDataFateher" :isLoading="isLoading" :templateOid="templateOid"
        :tableHeadFindData="tableHeadFindData" :tableHeadBtnData="masterVrBtnList" :Treedata="Treedata"></VciMasterCrud>
        :tableHeadFindData="tableHeadFindData" :tableHeadBtnData="masterVrBtnList" :Treedata="Treedata" :TreeValue="TreeValue"></VciMasterCrud>
    </el-main>
  </el-container>
</template>
@@ -42,12 +42,16 @@
      tableHeadDataFateher: [],
      total: "",
      isLoading: false,
      tableHeadFindData: {}
      tableHeadFindData: {},
      TreeValue:''
    }
  },
  created() {
  },
  methods: {
    TreeValueEmit(val){
      this.TreeValue=val
    },
    codeClassifyOidList(val) {
      this.codeClassifyOid = val;
    },