src/api/apis/businessVoucher.js

@@ -23,25 +23,3 @@ export function queryDetailsByBillCodeAPI(data) {
     data,
   });
 }
-export function queryBillFiledsAPI(data) {
-  return request({
-    url: "/kangarooDataCenterV3/ae/push/log/queryBillFileds",
-    method: "post",
-    data,
-  });
-}
-
-export function queryBillPagedAPI(data) {
-  return request({
-    url: "/kangarooDataCenterV3/ae/push/log/queryBillPaged",
-    method: "post",
-    data,
-  });
-}
-export function queryDetailsByBillCodeAndMdmIdAPI(data) {
-  return request({
-    url: "/kangarooDataCenterV3/ae/push/log/queryDetailsByBillCodeAndMdmId",
-    method: "post",
-    data,
-  });
-}

src/api/apis/operationalModule.js

@@ -1,9 +1,8 @@
 import request from "@/utils/request";
 import baseTree from '@/components/base/BaseMenuTree/index.vue'
-import basePage from '@/components/base/basePage/index.vue'
 
 export default {
-  components: { basePage, baseTree }
+  components: { baseTree }
 }
 
 //业务模块

src/components/base/basePage/index.vue

@@ -35,14 +35,12 @@ export default {
     sizeChange(val) {
       let pageModel = this.pageModel
       pageModel.pageSize = val
-      pageModel.limit = val
       this.$emit('update:pageModel', pageModel)
       this.$emit('onPageChange')
     },
     currentChange(val) {
       let pageModel = this.pageModel
       pageModel.pageIndex = val
-      pageModel.page = val
       this.$emit('update:pageModel', pageModel)
       this.$emit('onPageChange')
     }

src/layout/components/IframeToggle/index.vue

@@ -47,11 +47,7 @@ export default {
           return data[4];
         }else if (url.includes("businessMatter")) {
           return data[5];
-        }else if (url.includes("accountantMatter")) {
+        } else {
-          return data[6];
-        }
-
-        else {
           return empty;
         }
       } else {

src/layout/components/NewMenu/index.vue

@@ -115,8 +115,7 @@ export default {
             this.currentPath.includes("IntegrationTaskCenter") ||
             this.currentPath.includes("businessCenter") ||
             this.currentPath.includes("ApplicationCenter")||
-            this.currentPath.includes("businessMatter") ||
+            this.currentPath.includes("businessMatter")
-            this.currentPath.includes("accountantMatter")
 
           ) {
             route.meta.affix = true;
@@ -187,12 +186,6 @@ export default {
           icon: "el-icon-postcard",
           show: false,
         },
-        {
-          title: "财资事项平台",
-          path: "/accountantMatter",
-          icon: "el-icon-postcard",
-          show: false,
-        },
       ],
     };
   },
@@ -205,8 +198,7 @@ export default {
         url.includes("IntegrationTaskCenter") ||
         url.includes("businessCenter") ||
         url.includes("ApplicationCenter") ||
-        url.includes("businessMatter") ||
+        url.includes("businessMatter")
-        url.includes("accountantMatter")
       ) {
         this.$store.dispatch("settings/changeSetting", {
           key: "showTagsView",
@@ -285,8 +277,7 @@ export default {
         item.path.includes("IntegrationTaskCenter") ||
         item.path.includes("businessCenter") ||
         item.path.includes("ApplicationCenter") ||
-        item.path.includes("businessMatter") ||
+        item.path.includes("businessMatter")
-        item.path.includes("accountantMatter")
       ) {
         this.$store.dispatch("settings/changeSetting", {
           key: "showTagsView",

src/layout/components/TagsView/index.vue

@@ -135,11 +135,7 @@ export default {
           currentData = data[4]
         } else if (url.includes('businessMatter')) {
           currentData = data[5]
-        } else if (url.includes('accountantMatter')) {
+        } else {
-          currentData = data[6]
-        }
-
-        else {
           currentData = []
         }
       } else {
@@ -270,8 +266,6 @@ export default {
             currentData = data[4]
           } else if (url.includes('businessMatter')) {
             currentData = data[5]
-          }else if (url.includes('accountantMatter')) {
-            currentData = data[6]
           }
         }
         if (this.isActive(view)) {
@@ -296,8 +290,6 @@ export default {
             INDEX = 4
           } else if (url.includes('businessMatter')) {
             INDEX = 5
-          } else if (url.includes('accountantMatter')) {
-            INDEX = 6
           }
         }
 
@@ -330,8 +322,6 @@ export default {
             INDEX = 4
           } else if (url.includes('businessMatter')) {
             INDEX = 5
-          }else if (url.includes('accountantMatter')) {
-            INDEX = 6
           }
         }
         if (INDEX != null) {
@@ -371,8 +361,6 @@ export default {
             INDEX = 4
           } else if (url.includes('businessMatter')) {
             INDEX = 5
-          } else if (url.includes('accountantMatter')) {
-            INDEX = 6
           }
         }
         if (INDEX != null) {

src/router/index.js

@@ -172,15 +172,6 @@ export const constantRoutes = [{
           title: '会计事项平台',
           icon: 'dashboard'
         }
-      },
-      {
-        path: 'accountantMatter',
-        component: () => import('@/views/newVersionView/accountantMatter/index'),
-        name: 'accountantMatter',
-        meta: {
-          title: '财资事项平台',
-          icon: 'dashboard'
-        }
       }
     ]
   },

src/store/modules/tagsView.js

@@ -7,7 +7,6 @@ const state = {
         [],
         [],
       [],
-      []
     ],
     cachedViews: [
         [],
@@ -16,7 +15,6 @@ const state = {
         [],
         [],
       [],
-      []
     ],
     iframeViews: [
         [],
@@ -24,7 +22,6 @@ const state = {
         [],
         [],
         [],
-      [],
       []
     ],
 
@@ -49,8 +46,6 @@ const mutations = {
               Index = 4
             }else if (url.includes("businessMatter")) {
               Index = 5;
-            }else if (url.includes("accountantMatter")) {
-              Index = 6;
             }
         }
         if (Index != null) {
@@ -78,8 +73,6 @@ const mutations = {
                 Index = 4
             }else if (url.includes("businessMatter")) {
               Index = 5;
-            }else if (url.includes("accountantMatter")) {
-              Index = 6;
             }
         }
         if (Index != null) {
@@ -116,8 +109,6 @@ const mutations = {
                 Index = 4
             }else if (url.includes("businessMatter")) {
               Index = 5;
-            }else if (url.includes("accountantMatter")) {
-              Index = 6;
             }
         }
         if (Index != null) {
@@ -143,8 +134,6 @@ const mutations = {
                 Index = 4
             }else if (url.includes("businessMatter")) {
               Index = 5;
-            }else if (url.includes("accountantMatter")) {
-              Index = 6;
             }
         }
         if (Index != null) {
@@ -173,8 +162,6 @@ const mutations = {
                 Index = 4
             }else if (url.includes("businessMatter")) {
               Index = 5;
-            }else if (url.includes("accountantMatter")) {
-              Index = 6;
             }
         }
         if (Index != null) {
@@ -198,8 +185,6 @@ const mutations = {
                 Index = 4
             }else if (url.includes("businessMatter")) {
               Index = 5;
-            }else if (url.includes("accountantMatter")) {
-              Index = 6;
             }
         }
         if (Index != null) {
@@ -224,8 +209,6 @@ const mutations = {
                 Index = 4
             }else if (url.includes("businessMatter")) {
               Index = 5;
-            }else if (url.includes("accountantMatter")) {
-              Index = 6;
             }
         }
         if (Index != null) {
@@ -250,9 +233,7 @@ const mutations = {
             } else if (url.includes("ApplicationCenter")) {
                 INDEX = 4
             }else if (url.includes("businessMatter")) {
-              INDEX = 5;
+              Index = 5;
-            }else if (url.includes("accountantMatter")) {
-              INDEX = 6;
             }
         }
         if (INDEX != null) {
@@ -282,8 +263,6 @@ const mutations = {
                 INDEX = 4
             }else if (url.includes("businessMatter")) {
               INDEX = 5;
-            }else if (url.includes("accountantMatter")) {
-              INDEX = 6;
             }
         }
         if (INDEX != null) {
@@ -308,8 +287,6 @@ const mutations = {
                 INDEX = 4
             }else if (url.includes("businessMatter")) {
               INDEX = 5;
-            }else if (url.includes("accountantMatter")) {
-              INDEX = 6;
             }
         }
         if (INDEX != null) {
@@ -332,8 +309,6 @@ const mutations = {
                 INDEX = 4
             }else if (url.includes("businessMatter")) {
               INDEX = 5;
-            }else if (url.includes("accountantMatter")) {
-              INDEX = 6;
             }
         }
         if (INDEX != null) {
@@ -356,8 +331,6 @@ const mutations = {
                 INDEX = 4
             }else if (url.includes("businessMatter")) {
               INDEX = 5;
-            }else if (url.includes("accountantMatter")) {
-              INDEX = 6;
             }
         }
         if (INDEX != null) {
@@ -385,8 +358,6 @@ const mutations = {
                 INDEX = 4
             }else if (url.includes("businessMatter")) {
               INDEX = 5;
-            }else if (url.includes("accountantMatter")) {
-              INDEX = 6;
             }
         }
         if (INDEX != null) {
@@ -427,8 +398,6 @@ const mutations = {
                 INDEX = 4
             }else if (url.includes("businessMatter")) {
               INDEX = 5;
-            }else if (url.includes("accountantMatter")) {
-              INDEX = 6;
             }
         }
         if (INDEX != null) {

src/views/ItemEntryTemplate/index.vue

@@ -425,28 +425,6 @@
               {{ row.row.pkCashflow }}
             </div>
           </template>
-          <template #def1="{row}">
-            <div v-if="editFlag">
-              <el-select
-                class="w-100"
-                v-model="row.row.def1"
-                filterable
-                :clearable="true"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="(el, index) in [{label:'是',value:'Y'},{label:'否',value:'N'}]"
-                  :key="el.value"
-                  :label="el.label"
-                  :value="el.value"
-                >
-                </el-option>
-              </el-select>
-            </div>
-            <div v-else>
-              {{ row.row.def1 === 'Y' ? '是' : '否' }}
-            </div>
-          </template>
           <!--          备注-->
           <template #remark="{row}">
             <div v-if="editFlag">
@@ -854,7 +832,7 @@ export default {
       clickRowKey: '',
       activeTabs: '元数据属性',
       tabItem: ['元数据属性', '固定值'],
-      arithmeticArr: ['+', '-', '*', '/', '->', '==', '(', ')', '<', '>', '<=', '>=', 'substr(,,)','if(*?:)'],
+      arithmeticArr: ['+', '-', '*', '/', '->', '==', '(', ')', '<', '>', '<=', '>=', 'substr(,,)'],
       //公式text
       textarea: '',
       textareaEn: '',
@@ -1198,11 +1176,6 @@ export default {
           prop: 'pkCashflow',
           width: 150
         },
-        {
-          label: '是否计算科目余额',
-          prop: 'def1',
-          width: 150
-        },
         {
           label: '备注',
           prop: 'remark',

src/views/businessVoucher/index.vue

@@ -25,7 +25,7 @@
           </div>
           <div style="margin-left: 5px;display: flex;align-items: center;">
             <div style="width: 100px">单据号：</div>
-            <el-input v-model="searchObjTable.bill_code" clearable></el-input>
+            <el-input v-model="searchObjTable.billCode" clearable></el-input>
           </div>
           <div style="margin-left: 5px;display: flex;align-items: center">
             <div>单据日期起：</div>
@@ -54,7 +54,7 @@
             </el-select>
           </div>
           <div>
-            <el-button type="primary" size="small" @click="resetTable">查询</el-button>
+            <el-button type="primary" size="small" @click="getTableData">查询</el-button>
           </div>
           <div>
             <el-button type="primary" size="small" @click="coreDataOpenDialog">生成凭证</el-button>
@@ -67,7 +67,7 @@
         <div>分录信息</div>
       </div>
       <div class="table">
-        <base-table ref="customtable" :showIndex="false" :slotrow="true" :showSelect="true"
+        <base-table ref="customtable" :showIndex="false" :slotrow="false" :showSelect="true"
                     tableHeight="calc(50vh - 100px)" :tableData="tableData" :tableColumn="tableColumn"
                     @radioChange="radioChange" id="printMe" @onSelectionChange="onSelectionChange"
         >
@@ -80,13 +80,12 @@
             </div>
           </template>
         </base-table>
-        <base-page :pageModel.sync="pageModel" @onPageChange="pageChange"></base-page>
       </div>
       <!--      辅助核算-->
       <template v-if="this.selected.length">
         <div class="table">
           <base-table ref="assistTable" :showIndex="false" :slotrow="false"
-                      tableHeight="calc(50vh - 150px)" :tableData="assistTableData"
+                      tableHeight="calc(50vh - 100px)" :tableData="assistTableData"
                       :tableColumn="assistTableColumn"
                       id="printMe"
           >
@@ -145,12 +144,7 @@ import {
   tempupdateAPI, typeDeleteAPI, typeSaveAPI, typeUpdateAPI
 } from '@/api/apis/ItemEntryTemplate'
 import { subjectClassificationqueryAllAPI } from '@/api/apis/classifyDefinition'
-import {
+import { logqueryBillAPI, coreGenerateAPI, queryDetailsByBillCodeAPI } from '@/api/apis/businessVoucher'
-  logqueryBillAPI,
-  coreGenerateAPI,
-  queryDetailsByBillCodeAPI,
-  queryBillFiledsAPI, queryBillPageddsAPI, queryBillPagedAPI, queryDetailsByBillCodeAndMdmIdAPI
-} from '@/api/apis/businessVoucher'
 import customFormDialog from './compoments/customFormDialog'
 import assistTableDialog from './compoments/assistTableDialog'
 
@@ -224,7 +218,7 @@ export default {
       clickRowKey: '',
       activeTabs: '元数据属性',
       tabItem: ['元数据属性', '固定值'],
-      arithmeticArr: ['+', '-', '*', '/', '->', '==', '(', ')', '<', '>', '<=', '>=', 'substr(,,)','if(*?:)'],
+      arithmeticArr: ['+', '-', '*', '/', '->', '==', '(', ')', '<', '>', '<=', '>=', 'substr(,,)'],
       //公式text
       textarea: '',
       textareaEn: '',
@@ -251,42 +245,26 @@ export default {
           prop: 'voucherNo',
           width: 100
         },
-        {
-          label: '会计科目',
-          prop: 'subjdispname',
-          width: 100
-        },
-        {
-          label: '辅助核算',
-          prop: 'assist',
-          width: 100
-        },
         {
           label: '摘要',
           prop: 'abstractStr',
-          width: 100
+          width: 160
         },
         {
-          label: '借方本币金额',
+          label: '借方',
-          prop: 'jbbSum',
+          prop: 'jYbSum',
-          width: 100
+          width: 120
         },
         {
-          label: '借方原币金额',
+          label: '贷方',
-          prop: 'jybSum',
+          prop: 'dYbSum',
-          width: 100
+          width: 120
         },
         {
-          label: '贷方本币金额',
+          label: '操作',
-          prop: 'dbbSum',
+          prop: 'operate',
-          width: 100
+          width: 160
-        },
+        }
-        {
-          label: '贷方原币金额',
-          prop: 'dybSum',
-          width: 100
-        },
-
       ],
       billTypeClickCode: '',
       masterTableData: [],
@@ -542,14 +520,17 @@ export default {
       pageModel: {
         page: 1, //当前页码
         limit: 20, //每页显示多少
-        total: 0
+        prop7: '',
+        propValue7: '',
+        prop8: '',
+        propValue8: ''
       },
       selected: [],
       treeSelect: [],
       tableColumn: [
         {
           label: '单据号',
-          prop: 'bill_code'
+          prop: 'billCode'
         },
         {
           label: '单据日期',
@@ -650,11 +631,11 @@ export default {
     async coreData(date) {
       let arr = []
       this.checkBoxList.forEach(item => {
-        arr.push(item.bill_code)
+        arr.push(item.billCode)
       })
       let params = {
         mdmId: this.billTypeClickID,
-        bill_code: arr.join(','),
+        billCode: arr.join(','),
         targetDate: date
       }
       this.openLoading()
@@ -664,6 +645,43 @@ export default {
         this.resetTable()
       }
     },
+    async ixedValueFormelDialogClick(row) {
+      if (row.label === '参照') {
+        this.fixedValuelDialogClick(false)
+      } else {
+        if (!this.fixedValueClickRow.namefieldname) {
+          this.$vmNews('请选择参照值')
+          return
+        }
+
+        this.addTableColumn2 = [
+          {
+            label: '名称',
+            prop: this.fixedValueClickRow.namefieldname
+          },
+          {
+            label: '编码',
+            prop: this.fixedValueClickRow.codefieldname
+          }
+
+        ]
+        this.addDialog = true
+        this.addTiTle = this.fixedValueClickRow.dbName
+        this.pageModel.propValue7 = ''
+        this.pageModel.propValue8 = ''
+        this.pageModel.prop7 = ''
+        this.pageModel.prop8 = ''
+        this.getAddTableData()
+      }
+    },
+    getTableAddList(val) {
+      // console.log(val, 'val', this.fixedValueClickRow)
+      this.pageModel.propValue7 = val
+      this.pageModel.propValue8 = val
+      this.pageModel.prop7 = this.fixedValueClickRow.codefieldname
+      this.pageModel.prop8 = this.fixedValueClickRow.namefieldname
+      this.getAddTableData()
+    },
     addPickDialog() {
       if (!this.$refs.baseChoice2.optionData[this.fixedValueClickRow.namefieldname]) {
         this.$vmNews('请选择一条数据')
@@ -678,6 +696,21 @@ export default {
       // console.log(this.clickRow, 'this.clickRow')
       this.addDialog = false
     },
+    async getAddTableData() {
+      const res = await queryDataPagedByMapAPI({
+        ...this.pageModel,
+        pageNum: this.pageModel.page,
+        pageSize: this.pageModel.limit,
+        tablename: this.fixedValueClickRow.tablename,
+        pkentityorg: this.pkglbookClickObj.pkentityorg
+      })
+      this.$refs.baseChoice2.pageModel.total = res.attribute.total
+      this.addTableData2 = res.attribute.list
+    },
+    addonQuery(res, pageModel) {
+      this.pageModel = pageModel
+      this.getAddTableData()
+    },
     //超级转换器！
     transitionRowHandle(item) {
       let obj = item
@@ -1387,43 +1420,25 @@ export default {
 
     },
     pageChange(model) {
-      console.log(model, 'model')
+      this.pageModel.page = model.page
-      // this.pageModel.page = model.page
+      this.pageModel.limit = model.limit
-      // this.pageModel.limit = model.limit
       this.getTableData()
     },
     async getTableData() {
       this.assistTableData = []
       if (!this.billTypeClickID) return
-      const res2 = await queryBillFiledsAPI({
+      const res = await logqueryBillAPI({
+        ...this.searchObjTable,
         mdmId: this.billTypeClickID
       })
-      this.tableColumn = []
+      this.tableData = res.attribute
-      res2.attribute.listList.forEach(item => {
-        item.label = item.chName
-        item['prop'] = item.enName
-        item.ruleList.forEach(ele => {
-          item[ele.ruleCode] = ele.ruleValue
-        })
-      })
-      this.tableColumn = res2.attribute.listList
-      console.log(this.tableColumn, 'this.tableColumn')
-      const res = await queryBillPagedAPI({
-        ...this.searchObjTable,
-        mdmId: this.billTypeClickID,
-        pageNum: this.pageModel.page,
-        pageSize: this.pageModel.limit
-      })
-      console.log(res, '?')
-      this.tableData = res.attribute.list
-      this.pageModel.total = res.attribute.total
       this.$nextTick(() => {
         this.$refs.customtable.clearRadioIndex()
+        this.$refs.customtable.clearSelection()
         this.$refs.customtable.clearSelect()
         this.selected = []
         this.checkBoxList = []
       })
-
     },
     resetTable() {
       this.tableData = []
@@ -1432,20 +1447,10 @@ export default {
       this.getTableData()
     },
     // 点击某条数据
-    async radioChange(val) {
+    radioChange(val) {
-      console.log(val, '?')
-      this.openLoading()
-      const res = await queryDetailsByBillCodeAndMdmIdAPI({
-        mdmId: this.billTypeClickID,
-        bill_code: val.bill_code
-      })
-      this.$set(val, 'logList', res.attribute)
-      // console.log(res, '?')
       this.selected = []
       this.selected.push(val)
-
       console.log(val.logList, '?val.assistEntityList')
-
       let row = {
         props: {
           children: 'sublistMdmModuleDbFileds',
@@ -1830,10 +1835,6 @@ export default {
 
 
 <style scoped lang="scss">
-::v-deep .el-table__body-wrapper {
-  height: 100% !important;
-}
-
 .tabs {
   width: 200px;
   display: flex;

src/views/newVersionView/accountantMatter/index.vue

@@ -1,172 +0,0 @@
-/**
-  desc 业务中心
- */
-<template>
-  <div class="workbench">
-    <h3 class="workbench-title">全部应用</h3>
-    <el-tabs>
-      <el-tab-pane
-        v-for="(item, index) in routeData"
-        :key="index"
-        :label="item.meta ? item.meta.title : ''"
-        v-if="item.meta"
-      >
-        <div class="menuContainer">
-          <div
-            v-for="(list, listIndex) in item.children"
-            class="menuBox"
-            @click="goRoute(item, list)"
-            v-if="!list.meta.hidden"
-          >
-            <img class="menuIcon" :src="list.meta.icon" v-if="list.meta.icon" />
-            <img class="menuIcon" src="../logo1.png" v-else />
-            <p class="menuContent">{{ list.meta.title }}</p>
-          </div>
-        </div>
-      </el-tab-pane>
-    </el-tabs>
-  </div>
-</template>
-
-<script>
-import { TagsView } from "@/layout/components";
-import request from "@/utils/request";
-
-export default {
-  name: "ApplicationCenter",
-  components: {
-    TagsView,
-  },
-  created() {
-    this.$store.dispatch("settings/changeSetting", {
-      key: "showTagsView",
-      value: true,
-    });
-  },
-  data() {
-    return {
-      routeData: [], //菜单数据
-    };
-  },
-  mounted() {
-    let routeList = localStorage.getItem("routeList")
-      ? JSON.parse(localStorage.getItem("routeList"))
-      : [];
-    this.routeData = this.OrganizeMenus(routeList);
-  },
-  methods: {
-    goRoute(val, item) {
-      let routeData = this.$router.resolve({
-        path: item.path,
-        name: item.name,
-        query: { mdmCode: item.meta.mdmCode, viewType: item.meta.viewType },
-      });
-      window.open(routeData.href, "_self");
-    },
-    // 处理icon
-    handlerIcon(item) {
-      let str = "";
-      if (item.includes("?")) {
-        str = item.split("?")[1];
-      } else {
-        str = item;
-      }
-      return str;
-    },
-    handlerIconColor(item) {
-      let color = "";
-      if (item.includes("?")) {
-        color = item.split("?")[0];
-      } else {
-        color = "#1478F6";
-      }
-      return color;
-    },
-    // 整理菜单数据
-    OrganizeMenus(data) {
-      let arrData = [];
-      // 会计事项平台
-      let arrID = ["688293d5d76e432487f7516bf969a822"];
-      arrID.forEach((a) => {
-        data.forEach((b) => {
-          if (a === b.id) {
-            arrData.push(b);
-          }
-        });
-      });
-      arrData.forEach((bItem) => {
-        if (bItem.children && bItem.children.length > 0) {
-          bItem.children.forEach((cItem) => {
-            if (cItem.meta.icon) {
-              this.getLogoUrl(cItem.meta.icon).then((res) => {
-                let imageUrl =
-                  "data:image/png/jpg;base64," +
-                  btoa(
-                    new Uint8Array(res).reduce(
-                      (el, byte) => el + String.fromCharCode(byte),
-                      ""
-                    )
-                  );
-                this.$set(cItem.meta, "icon", imageUrl);
-              });
-            }
-          });
-        }
-      });
-      return arrData;
-    },
-    getLogoUrl(id) {
-      return request({
-        url:
-          "/kangarooDataCenterV3/entranceController/fileDownloadNew?id=" + id,
-        method: "get",
-        responseType: "arraybuffer",
-      }).then((res) => {
-        return res;
-      });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.workbench {
-  background: #fff;
-  padding: 15px;
-  //margin: 0 10px;
-}
-
-.workbench-title {
-  margin: 15px 0;
-}
-
-.menuContainer {
-  display: flex;
-  flex-wrap: wrap;
-  background-color: #fff;
-}
-
-.menuBox {
-  display: flex;
-  align-items: center;
-  background: #fafafa;
-  padding: 10px 15px;
-  border-radius: 10px;
-  width: 200px;
-  margin: 10px;
-  cursor: pointer;
-}
-
-.menuIcon {
-  width: 36px;
-  height: 36px;
-  line-height: 36px;
-  border-radius: 12px;
-  margin-right: 10px;
-}
-
-.menuContent {
-  font-size: 14px;
-  color: #333333;
-}
-</style>

src/views/relevance/index.vue

@@ -421,7 +421,7 @@ export default {
       clickRowKey: '',
       activeTabs: '元数据属性',
       tabItem: ['元数据属性', '固定值'],
-      arithmeticArr: ['+', '-', '*', '/', '->', '==', '(', ')', '<', '>', '<=', '>=', 'substr(,,)','if(*?:)'],
+      arithmeticArr: ['+', '-', '*', '/', '->', '==', '(', ')', '<', '>', '<=', '>=', 'substr(,,)'],
       fixedValueForm: [
         {
           elCol: [

vue.config.js

@@ -41,9 +41,9 @@ module.exports = {
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://hzya.ufyct.com:9067/`,
         // target: `http://127.0.0.1:9081/`,
-        target: `http://192.168.2.189:10086`,//一凡
+        // target: `http://192.168.2.189:10086`,//一凡
         // target: `http://192.168.2.78:8080`,
-        // target: `http://b8bc6e8e.natappfree.cc`,
+        target: `http://b8bc6e8e.natappfree.cc`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''