Merge branch 'dev_v2' of ssh://gogs.zfire.top:2222/zfire-front/supply-front

package-lock.json

@@ -4267,9 +4267,9 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "@zjlib/element-plugins": {
-      "version": "2.1.17",
-      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-2.1.17.tgz",
-      "integrity": "sha512-s5FaPHZ4KmyNO89PsMoqQnuXBYe/hq6Ku4sFbL3gzB6Gj4j5ov1pJbHRgYPX0DqiUmufNcTWNeAPk17SCE/qyQ==",
+      "version": "2.1.19",
+      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-2.1.19.tgz",
+      "integrity": "sha512-HT0fbWMq7ulNhAXULPDJdaJOhTzixrfBQ+GW330iIoaOoawIhztioiLXN9Y7EMNaDL1+71ccsD4WusKiIEeXtQ==",
       "requires": {
         "@turf/turf": "^6.5.0",
         "@vuemap/vue-amap": "^0.1.12",

package.json

@@ -15,7 +15,7 @@
     "test:ci": "npm run lint && npm run test:unit"
   },
   "dependencies": {
-    "@zjlib/element-plugins": "^2.1.17",
+    "@zjlib/element-plugins": "^2.1.19",
     "axios": "0.18.1",
     "clipboard": "^2.0.8",
     "concurrent-tasks": "^1.0.7",

src/components/template/sel-export-column-list.vue

@@ -7,7 +7,6 @@
     width="400px"
   >
     <el-table
-      :data="exportColumnList"
       v-bind="{
         height: '100%',
         style: 'width: 100%',
@@ -15,6 +14,7 @@
         headerCellClassName: 'headerRowColor',
         size: 'mini'
       }"
+      :data="exportColumnList"
     >
       <el-table-column
         v-bind="{
@@ -73,7 +73,7 @@ export default {
       handler() {
         if (this.columnList && this.columnList.length) {
           this.exportColumnList = this.columnList.map(item => {
-            return { ...item.exportField, isExport: true }
+            return { ...item.exportField, isExport: !item.hidden }
           })
           this.dialogVisible = true
         } else {

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

@@ -417,6 +417,19 @@ export default {
               this.showTable = true
             })
           }
+          // 全局过滤特殊列表
+          /**------------------------------------------------------------------------------------------------------- */
+          var listcp = [...res.fieldBeans]
+          if (!~['100093', '600023', '', null, undefined].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--
+              }
+            }
+          }
+          res.fieldBeans = listcp
+          /**------------------------------------------------------------------------------------------------------- */
           if (this.fieldBeansHook) {
             res.fieldBeans = this.fieldBeansHook(res.fieldBeans) || res.fieldBeans
           }

src/views/supply/apply/apply_list.vue

@@ -12,7 +12,6 @@
       :columnParsing="columnParsing"
       :optionsEvensGroup="optionsEvensGroup"
       :replaceOrNotMap="false"
-      :fieldBeansHook="fieldBeansHook"
     >
     </template-page>
     <ExamineDialog
@@ -237,18 +236,6 @@ 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 (