田源
2023-06-19 ddd17a7643ca777f70389ae9eacb75b8dba6beab
联调物品主数据剩余功能,处理相似项查询
已修改4个文件
已重命名1个文件
96 ■■■■ 文件已修改
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue 75 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/main.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/views/MasterData/items.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/vue.config.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
ÎļþÃû´Ó Source/UBCS-WEB/src/components/Crud/Crud.vue ÐÞ¸Ä
@@ -9,7 +9,7 @@
          :codeRuleOid="this.codeRuleOid"
          :disabledProp="disabledProp"
          :templateOid="templateOid"
          :type="add"
          type="add"
          :visible.sync="addvisible"
          @submit="AddSumbit"
        >
@@ -22,7 +22,7 @@
          :disabledProp="disabledProp"
          :rowOid="rowOid"
          :templateOid="templateOid"
          :type="edit"
          type="edit"
          :title="'修改编码信息'"
          :visible.sync="editvisible"
          @submit="EditSumbit"
@@ -35,7 +35,7 @@
        <el-button plain size="small" type="primary">删除</el-button>
        <el-button plain size="small" type="primary" @click="setHandler">发布</el-button>
        <set-personnel :visible.sync="visibleFlow"  :parameter="parameter"
                       type="PUBLIC"></set-personnel>
        ></set-personnel>
        <el-button plain size="small" type="primary" @click="DataChange">数据更改</el-button>
        <FormTemplateDialog
          :codeClassifyOid="this.codeClassifyOid"
@@ -56,7 +56,14 @@
          <advanced-query :options="this.options" :visible.sync="findvisible"
                          @echoContion="echoContion"></advanced-query>
        </el-button>
        <el-button plain size="small" type="primary">相似项查询</el-button>
        <el-button plain size="small" type="primary" @click="similarHandler">相似项查询</el-button>
        <ResembleQueryDialog
          :visible.sync="similarVisible"
          :templateOid="templateOid"
          :codeClassifyOid="codeClassifyOid"
          :rowOid="rowOid"
          :codeRuleOid="this.codeRuleOid"
        ></ResembleQueryDialog>
        <el-button plain size="small" style="margin-left: 1px;margin-top:10px" type="primary">刷新</el-button>
        <el-input placeholder="请输入关键字按回车查询" size="small"
                  style="width: 180px;margin-left: 5px;margin-top:10px"></el-input>
@@ -111,11 +118,12 @@
import {listCodeAttributeByClassId} from '@/api/integration/integration.js'
import integrationTransfer from '@/views/integration/integrationTransfer'
import SetPersonnel from '@/components/template/SetPersonnel'
import ResembleQueryDialog from "@/components/FormTemplate/ResembleQueryDialog.vue";
export default {
  components: {
    integrationTransfer,
    SetPersonnel
    SetPersonnel,
    ResembleQueryDialog
  },
  name: "Crud.vue",
  props: {
@@ -156,12 +164,13 @@
  },
  data() {
    return {
      //相似项查询
      similarVisible:false,
      //发布
      parameter:{
        ids:['0000','22222222'],
        code:'8b5e2017-990f-454a-9c39-4c4eeeb57553',
        code:this.templateOid,
        type:'PUBLIC',
        name:'模板name',
        template:'模板template'
      },
      visibleFlow: false,
@@ -236,26 +245,10 @@
        this.page.total = newval;
      }
    },
    // tableHeadDataFateher: {
    //   handler(newval, oldval) {
    //     let List = newval.tableDefineVO.cols[0];
    //     List.forEach(item => {
    //       let columnItem = {
    //         label: item.title,
    //         prop: item.field,
    //         type: this.columnType[item.type],
    //         sortable: item.sort,
    //         width: item.minWidth
    //       };
    //       this.tableHeadData.push(columnItem);
    //       console.log('table',this.tableHeadData)
    //     })
    //   }
    // }
  },
  methods: {
    setHandler() {
      this.visibleFlow = true
      this.visibleFlow = true;
    },
    huishouHandler() {
@@ -310,21 +303,6 @@
      this.$nextTick(() => {
        this.$refs.crud.doLayout();
      });
    },
    tableHeadHandle() {
      this.options = this.tableHeadDataFateher.tableDefineVO.seniorQueryColumns
      this.List = this.tableHeadDataFateher.tableDefineVO.cols[0];
      this.List.forEach(item => {
        let columnItem = {
          label: item.title,
          prop: item.field,
          type: this.columnType[item.type],
          sortable: item.sort,
          width: item.minWidth
        };
        this.option.column.push(columnItem);
        this.option.column = this.tableHeadData;
      })
    },
    //表格头渲染
    CrudHeaderRend() {
@@ -401,7 +379,11 @@
    },
    //多选
    handleSelectionChange(row) {
      this.rowOid = row[0].oid;
      if(this.row){
        this.rowOid = row[0].oid;
      }else {
        this.rowOid=''
      }
      this.selectRow = row;
      console.log(row)
    },
@@ -435,6 +417,17 @@
        console.log(res)
      })
    },
    //相似项查询
    similarHandler(){
      if (this.selectRow.length <= 0) {
        this.$message.warning('请选择一条数据')
      } else if (this.selectRow.length > 1) {
        this.$message.warning('只能选择一条数据')
      }  else {
        this.similarVisible=true;
      }
    },
    //数据更改
    DataChange(){
      if (this.selectRow.length <= 0) {
Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
@@ -517,7 +517,6 @@
            collapse: true,
            column: [],
          });
          return
        }
        if (
          formItem.type === "combox" &&
@@ -597,7 +596,7 @@
      this.$set(this.option, "column", column);
      this.$set(this.option, "group", group);
      this.formIndex++;
      if (this.type === 'add' || this.type === 'preview') {
      if (this.type === 'add') {
        this.loading = false;
      }
      this.geDictData(dictKeys);
@@ -653,11 +652,11 @@
      if (type === "truefalse") {
        return [
          {
            key: 'false',
            key: false,
            value: "否",
          },
          {
            key: 'true',
            key: true,
            value: "是",
          },
        ];
@@ -701,7 +700,7 @@
    },
    // èŽ·å–è¡¨å•è¯¦æƒ…æ•°æ®
    getFormDetail() {
      if (this.type === 'add' || this.type === 'preview') return
      if (this.type === 'add') return
      getFormDetail({ templateOid: this.templateOid, oid: this.rowOid }).then(
        (res) => {
          this.form = Object.assign(this.form, res.data.data[0])
Source/UBCS-WEB/src/main.js
@@ -44,7 +44,7 @@
import referSelectBtmAttrDialog from "@/components/code-dialog-page/referSelectBtmAttrDialog"
import advancedQuery from "@/components/advanced-query/advancedQuery"
import businessAdd from "@/views/modeling/BusinessAdd"
import TableCrud from "@/components/Crud/Crud"
import VciMasterCrud from "@/components/Crud/VciMasterCrud"
import originalAdd from "@/views/modeling/originalAdd"
import FormTemplateDialog from "@/components/FormTemplate/index"
import linkTypeAdd from "@/views/modeling/LinkTypeAdd"
@@ -94,7 +94,7 @@
Vue.component('advancedQuery',advancedQuery)
Vue.component('businessAdd',businessAdd)
Vue.component('attrCrud',attrCrud)
Vue.component('TableCrud',TableCrud)
Vue.component('VciMasterCrud',VciMasterCrud)
Vue.component('originalAdd',originalAdd)
Vue.component('referBtmTypeCrudDialog',referBtmTypeCrudDialog)
Vue.component('referSelectBtmAttrDialog',referSelectBtmAttrDialog)
Source/UBCS-WEB/src/views/MasterData/items.vue
@@ -17,7 +17,7 @@
      </el-aside>
      <el-main>
<!--        è¡¨æ ¼ç»„ä»¶-->
      <TableCrud :page="this.page"
      <VciMasterCrud :page="this.page"
                 :codeClassifyOid="this.codeClassifyOid"
                 :coderuleoid="this.coderuleoid"
                 @pageSize="pageSizes"
@@ -28,7 +28,7 @@
                 :isLoading="isLoading"
                 :templateOid="templateOid"
                 :tableHeadFindData="tableHeadFindData"
      ></TableCrud>
      ></VciMasterCrud>
      </el-main>
    </el-container>
</template>
Source/UBCS-WEB/vue.config.js
@@ -28,11 +28,11 @@
        //本地服务接口地址
        // target: 'http://localhost:37000',
        // 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://192.168.1.51:37000/',
          // target: 'http://192.168.1.104: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',