整合冲突代码

 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/attrCrud.vue

@@ -1,7 +1,6 @@
<template>
  <div>
    <div style="display: flex;flex-wrap: wrap;" v-if="this.crudArrayFlag">
      <el-button-group>
      <!--新增-->
      <el-button v-if="attrEditVisible == false && attrFlagChiledren==false" size="small" type="primary" icon="el-icon-plus" @click="busineHandle">添加 {{ msg }}</el-button>
      <!--        全屏编辑-->
@@ -10,9 +9,6 @@
      <el-button icon="el-icon-info" size="small" @click="rulesVisible=true">验证规则</el-button>
      <!--        属性分组-->
      <el-button icon="el-icon-menu" size="small" @click="attrVisibleHandle">属性分组</el-button>
      </el-button-group>
      <el-button-group>
<<<<<<< HEAD
        <!--        分类注入-->
        <el-button icon="el-icon-magic-stick" size="small" @click="injectBtn">分类注入</el-button>
          <!--    组合规则-->
@@ -23,7 +19,6 @@
        <el-button size="small" @click="CascadeHandle">级联属性</el-button>
        <!--    预览排序-->
        <el-button size="small" icon="el-icon-arrow-down">预览排序</el-button>
=======
      <!--        分类注入-->
      <el-button icon="el-icon-magic-stick" size="small" @click="injectBtn">分类注入</el-button>
        <!--    组合规则-->
@@ -34,8 +29,6 @@
      <el-button size="small" @click="CascadeHandle">级联属性</el-button>
      <!--    预览排序-->
      <el-button size="small" @click="orderHandle" icon="el-icon-arrow-down">预览排序</el-button>
>>>>>>> 92e7dde00a56aff46e01efe72e1f7ab9b76dcf69
      </el-button-group>
      <!--    保存-->
      <el-button size="small" @click="addsHandler" icon="el-icon-check">保存</el-button>
      <!--    删除-->
@@ -268,6 +261,11 @@
                    @blur="saveRows"></el-input>
          <el-input-number controls-position="right" v-if="editingRows === row && editShows== item.prop && item.edit == 'number'" v-model="row[item.prop]"
                           @blur="saveRows"></el-input-number>
          <el-select v-model="row[item.prop]" slot="prepend" v-if="editingRows === row && editShows== item.prop && item.prop == 'codeDateFormat'  && row[item.prop] ==''" @focus="DataChangeHandler">
            <el-option label="餐厅名" value="1"></el-option>
            <el-option label="订单号" value="2"></el-option>
            <el-option label="用户电话" value="3"></el-option>
          </el-select>
          <el-switch
            v-if="item.edit === 'switch'" v-model="row[item.sortableprop]" active-value="true"
            inactive-value="false">
@@ -290,11 +288,10 @@
      </el-table-column>
    </el-table>
  </div>
  <!--  </avue-crud>-->
</template>

<script>
import {AttrByBtm, gridCodeClassifyTemplateAttr, batchAddSave, copyto} from '@/api/template/templateAttr'
import {AttrByBtm, gridCodeClassifyTemplateAttr, batchAddSave, copyto,listByFlag} from '@/api/template/templateAttr'

export default {
  name: "attrCrud .vue",
@@ -1298,6 +1295,16 @@
    formAttr(row, column) {
      console.log(row,column)
    },
    //时间下拉格式
    DataChangeHandler(){
      debugger
      listByFlag({comboxKey: 'codedateformat',
        id: 'codedateformat',
        namespace: 'codeclstempattr',
        flag: 'dateFormates'}).then(res=>{
        console.log(res)
      })
    },
    //属性分组按钮
    attrVisibleHandle() {
      if (this.attrSelectList.length > 1) {
@@ -1527,7 +1534,7 @@
        "层级设置": this.injectOption.injectNum,
        "是否可修改": this.injectOption.change
      }
      console.log(this.injectOption)      
      console.log(this.injectOption)
      this.$set(this.attrRow, 'classifyInvokeLevel', data);
      this.injectVisible = false
    },

 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',