田源
2023-07-04 371a5adff4a62563ae7b240514d3037a0962359a
编码规则bug
已修改3个文件
113 ■■■■ 文件已修改
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue 87 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/Tree/classifyTrees.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -3,10 +3,10 @@
    <div class="testbox">
      <div>
        <el-button plain size="small" type="primary" @click="addvisible = true"
          >增加
        >增加
        </el-button>
        <el-button plain size="small" type="primary" @click="editHandler"
          >编辑
        >编辑
        </el-button>
        <el-button plain size="small" type="primary" @click="openBatchImport('batchImportApply')">批量导入申请</el-button>
        <el-button plain size="small" type="primary" @click="openBatchImport('historyImport')">历史数据导入</el-button>
@@ -15,22 +15,22 @@
        <el-button plain size="small" type="primary">查看流程历史</el-button>
        <el-button plain size="small" type="primary">删除</el-button>
        <el-button plain size="small" type="primary" @click="setHandler"
          >发布</el-button
        >发布</el-button
        >
        <el-button plain size="small" type="primary" @click="DataChange"
          >数据更改</el-button
        >数据更改</el-button
        >
        <el-button plain size="small" type="primary" @click="huishouHandler"
          >回收</el-button
        >回收</el-button
        >
        <el-button plain size="small" type="primary" @click="openD"
          >导出
        >导出
        </el-button>
        <el-button plain size="small" type="primary" @click="findHandler"
          >查询
        >查询
        </el-button>
        <el-button plain size="small" type="primary" @click="similarHandler"
          >相似项查询</el-button
        >相似项查询</el-button
        >
        <el-button plain size="small" type="primary">刷新</el-button>
        <el-input
@@ -249,7 +249,7 @@
    this.doLayout();
  },
  watch: {
     tableHeadDataFateher:{
    tableHeadDataFateher:{
      handler(newval,oldval){
        this.options=newval.tableDefineVO.seniorQueryColumns
      }
Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
@@ -5,11 +5,28 @@
    <avue-form v-model="loneTreeNewForm" :option="options" @submit="submits" v-else-if="flag == 'edit'">
    </avue-form>
    <div>
      <el-dialog  :visible.sync="dialogVisible"   title="为【编码规则】选取值" append-to-body>
<!--      为【编码规则】选取值-->
      <el-dialog  :visible.sync="MasterdialogVisible"   title="为【编码规则】选取值" append-to-body>
        <avue-crud :data="masterData" :option="masterOption" @select="masterSelect"></avue-crud>
        <div style="padding-top: 10px;display: flex; justify-content: flex-end" >
          <el-button type="primary" size="small" @click="MasterHandlerClick">确定</el-button>
          <el-button  size="small" @click="dialogVisible=false">取消</el-button>
          <el-button  size="small" @click="MasterdialogVisible=false">取消</el-button>
        </div>
      </el-dialog>
<!--      关键属性查询规则-->
      <el-dialog  :visible.sync="KeydialogVisible"   title="为【关键属性查询规则】选取值" append-to-body>
        <avue-crud :data="KeyData" :option="masterOption" @select="masterSelect"></avue-crud>
        <div style="padding-top: 10px;display: flex; justify-content: flex-end" >
          <el-button type="primary" size="small" @click="KeyHandlerClick">确定</el-button>
          <el-button  size="small" @click="KeydialogVisible=false">取消</el-button>
        </div>
      </el-dialog>
      <!--      相似项查询规则-->
      <el-dialog  :visible.sync="SimidialogVisible"   title="为【相似项查询规则】选取值" append-to-body>
        <avue-crud :data="simData" :option="masterOption" @select="masterSelect"></avue-crud>
        <div style="padding-top: 10px;display: flex; justify-content: flex-end" >
          <el-button type="primary" size="small" @click="simHandlerClick">确定</el-button>
          <el-button  size="small" @click="SimidialogVisible=false">取消</el-button>
        </div>
      </el-dialog>
    </div>
@@ -24,6 +41,8 @@
  props: ['loneTreeNewForm','flag'],
  data() {
    return {
      KeyData:[],
      simData:[],
      name:"",
      oid:"",
      masterInput:'',
@@ -51,7 +70,9 @@
          }
        ]
      },
      dialogVisible:false,
      MasterdialogVisible:false,
      KeydialogVisible:false,
      SimidialogVisible:false,
      form: {
        name: "哈哈",
        sex: "男"
@@ -167,11 +188,13 @@
            label:"关键属性查询规则",
            prop:"codekeyattrrepeatoidName",
            labelWidth:128,
            focus:this.Keyfouce
          },
          {
            label:"相似查询规则",
            prop:"codeResembleRuleOidName",
            labelWidth:128,
            focus: this.simFouce
          },
        ]
@@ -181,7 +204,8 @@
    }
  },
  created() {
      this.defaultRend()
      this.MasterdefaultRend()
    this.KeydefaultRend()
  },
  methods: {
    submits(form,done){
@@ -197,24 +221,34 @@
      this.$message.success('请查看控制台');
      console.log(err)
    },
    //编码规则失焦
    CodeFoucus(){
      this.dialogVisible=true;
      console.log(this.dialogVisible)
      this.MasterdialogVisible=true;
    },
    //编码规则确定
    MasterHandlerClick(){
      if(this.masterSelectList.length>1){
        this.$message.warning('只能选择一条数据')
      }else if(this.masterSelectList.length<=0){
        this.$message.warning('请选择一条数据')
      }else {
        this.dialogVisible=false;
        this.MasterdialogVisible=false;
        this.masterSelectList=[]
        this.loneTreeNewForm.codeRuleOidName=this.name;
        this.loneTreeNewForm.codeRuleOid=this.oid;
        console.log(this.masterSelectList)
      }
    },
    defaultRend(){
    //编码多选
    masterSelect(row){
      console.log(row)
      this.masterSelectList=row;
      this.name=row[0].name;
      this.oid=row[0].oid;
      console.log('oid',this.oid)
    },
    //编码接口
    MasterdefaultRend(){
      defaultReferDataGrid({
        referType:'coderule',
        isMuti:'false',
@@ -225,12 +259,37 @@
      })
    },
    masterSelect(row){
      console.log(row)
      this.masterSelectList=row;
      this.name=row[0].name;
      this.oid=row[0].oid;
      console.log('oid',this.oid)
    // 关键属性失焦
    Keyfouce(){
      this.KeydialogVisible=true;
    },
    //关键属性确定
    KeyHandlerClick(){
      if(this.masterSelectList.length>1){
        this.$message.warning('只能选择一条数据')
      }else if(this.masterSelectList.length<=0){
        this.$message.warning('请选择一条数据')
      }else {
      }
    },
    KeydefaultRend(){
      defaultReferDataGrid({
        referType:'codekeyattrrepeat',
        isMuti:'false',
        'conditionMap["lcstatus"]':'Enabled'
      }).then(res=>{
        this.keyData=res.data.records;
      })
    },
    // 相似项失焦
    simFouce(){
      this.SimidialogVisible=true;
    },
    //相似项确定
    simHandlerClick(){
    }
  }
}
Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -7,8 +7,10 @@
        <div>
          <div style="display: flex;justify-content: space-around">
            <el-button plain size="small" type="primary" @click="TreeAdd">添加</el-button>
            <el-button plain size="small" type="primary" @click="ExportExcel">导出</el-button>
            <el-button plain size="small" type="primary" @click="ImportExcel">导入</el-button>
            <el-button plain size="small" type="primary" @click="TreeEdit">修改</el-button>
            <el-button plain size="small" type="primary" @click="TreeDel">删除</el-button>
<!--            <el-button plain size="small" type="primary" @click="ExportExcel">导出</el-button>-->
<!--            <el-button plain size="small" type="primary" @click="ImportExcel">导入</el-button>-->
            <el-button plain size="small" type="primary" @click="flushed">刷新</el-button>
          </div>
          <div style="display: flex;justify-content: space-around;margin-top: 5px;margin-bottom: 5px">
@@ -79,8 +81,6 @@
            <template slot="menuLeft">
              <el-button plain size="small" type="primary" @click="FindeHanler">查询</el-button>
              <el-button plain size="small" type="primary" @click="TemRefresh">刷新</el-button>
                    <el-button plain size="small" type="primary" @click="TreeEdit">修改</el-button>
            <el-button plain size="small" type="primary" @click="TreeDel">删除</el-button>
            <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>