Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Source/UBCS-WEB/src/components/Tree/attrCrud.vue

 Source/UBCS-WEB/src/api/template/templateAttr.js

@@ -182,3 +182,13 @@
    }
  })
}
//时间格式下拉菜单
export const  listByFlag = (params) =>{
  return request({
    url:'/api/ubcs-code/bdSelectInputController/listByFlag',
    method: 'get',
    params:{
      ...params
    }
  })
}

 Source/UBCS-WEB/src/components/Tree/classifyTrees.vue

@@ -81,20 +81,6 @@
            <el-button plain size="small" type="primary" @click="Enable">启用</el-button>
            <el-button plain size="small" type="primary" @click="Deactivate">停用</el-button>
              <el-button plain size="small" type="primary" @click="CloneBtn">从其它模板克隆</el-button>
              <!-- <div style="display: inline-block">
                <el-select v-model="searchTemplate.searchCondition" placeholder="请选择" class="search-condition">
                  <el-option
                    v-for="item in searchTemplateOptions"
                    :key="item.value"
                    :label="item.label"
                    :value="item.value">
                  </el-option>
                </el-select>
                <el-input v-model="searchTemplate.findText" placeholder="请输入关键字按回车查询"
                  size="small"
                  @keyup.enter.native="EnterFind">
                </el-input>
              </div> -->
              <!--              查询对话框-->
           <el-dialog :visible.sync="FindFormVisible" append-to-body title="高级查询">
              <div>
@@ -210,48 +196,6 @@
  inject: [, "crudTreeData"],
  data() {
    return {
<<<<<<< HEAD
=======
      // //表格option配置项
      // crudTreeOption: {
      //   index: true,
      //   border: true,
      //   height:180,
      //   selection:true,
      //   addBtn:this.addFlag,
      //   column: [
      //     {
      //       label: "模板编号",
      //       prop: "id"
      //     },
      //     {
      //       label:"模板名称",
      //       prop:"name"
      //     },
      //     {
      //       label: "模板描述",
      //       prop:"description"
      //     },
      //     {
      //       label:"版本号",
      //       prop:"revisionSeq"
      //     },
      //     {
      //       label:"状态",
      //       prop:"lcStatusText"
      //     }
      //   ]
      // },
      // searchTemplateOptions: [
      //   {
      //     value: 'id',
      //     label: '模板编号'
      //   }, {
      //     value: 'name',
      //     label: '模板名称'
      //   }
      // ],
>>>>>>> 7ff3f607595a30fc66924eb4b60ff00407afbbc2
      addFlag:false,
      // 表格当前行id
      crudOid:"",
@@ -264,7 +208,7 @@
        searchCondition: 'id',
        findText: "",
      },
      

      //高级查询对话框
      FindFormVisible: false,
      //克隆模板对话框

 Source/UBCS-WEB/vue.config.js

@@ -27,9 +27,9 @@
      '/api': {
        //本地服务接口地址
        // target: 'http://localhost:37000',
        // target: 'http://192.168.1.51:37000',
        target: 'http://192.168.1.51:37000',
        // target: 'http://192.168.1.46: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',
        // target: 'http://192.168.1.63:37000',