Merge branch 'master' of https://gogs.zfire.top/zfire-front/supply-front

src/components/template/template-page-1.vue

@@ -195,12 +195,6 @@ export default {
         },
         {
           columnAttributes: {
-            label: '万能id',
-            prop: 'objId'
-          }
-        },
-        {
-          columnAttributes: {
             label: '模块名称',
             prop: 'moduleName'
           }

src/views/finance/balance_sum.vue

@@ -188,7 +188,7 @@ export default {
     //余额
     walletFn(v) {
       this.$router.push({
-        path: '/finance/details/wallet',
+        path: '/finance/wallet',
         query: {
           id: v
         }
@@ -197,7 +197,7 @@ export default {
     //明细
     seeFN(customerName, customerNumber, customerId) {
       this.$router.push({
-        path: '/finance/details/standbook_list',
+        path: '/finance/standbook_list',
         query: {
           customerName,
           customerNumber,

src/views/finance/standbook_list.vue

@@ -629,11 +629,7 @@ export default {
       // 这个时候组件还没有创建，所以要通过vm来访问
       // console.log(vm);
       vm.getCustomerDataList()
-      if (
-        from.path == '/finance/details/balance_sum' &&
-        to.path == '/finance/details/standbook_list' &&
-        vm.$route.query.customerId
-      ) {
+      if (from.path == '/finance/balance_sum' && to.path == '/finance/standbook_list' && vm.$route.query.customerId) {
         //只有是从A进到B页面才执行
         // 将要执行的逻辑
         vm.isShow = true

src/views/supply/apply/apply_list.vue

@@ -12,6 +12,7 @@
       :columnParsing="columnParsing"
       :optionsEvensGroup="optionsEvensGroup"
       :replaceOrNotMap="false"
+      :fieldBeansHook="fieldBeansHook"
     >
     </template-page>
     <ExamineDialog
@@ -236,6 +237,18 @@ export default {
     selectionChange(data) {
       this.multipleSelection = data
     },
+    fieldBeansHook(list) {
+      var listcp = [...list]
+      if (!~['100093', '600023', ''].indexOf(this.$store.state?.user?.userInfo?.customerNumber)) {
+        for (var i = 0; i < listcp.length; i++) {
+          if (~['是否同步到格匠采购入库单', '同步格匠失败原因'].indexOf(listcp[i].label)) {
+            listcp.splice(i, 1)
+            i--
+          }
+        }
+      }
+      return listcp
+    },
     operation() {
       return (h, { row, index, column }) => {
         return (
@@ -485,7 +498,6 @@ export default {
       this.isShowForm = false
       this.isShowReturnForm = false
       this.$refs.pageRef.refreshList()
-
     },
 
     handleDelete(id) {

src/views/supply/pickup/sum_list.vue

@@ -7,6 +7,7 @@
     :optionsEvensGroup="optionsEvensGroup"
     :columnParsing="columnParsing"
     :defaultSearchData="searchData"
+    :replaceOrNotMap="false"
   >
     <el-dialog title="物流信息" :visible.sync="visible" width="60%" @close="onClose" :close-on-click-modal="false">
       <el-timeline class="logistics" :reverse="false" v-if="logisticsDetail.length">