1.继续电子标签相关~

src/api/warehouseBusiness/warehouseInStock.js

@@ -17,6 +17,13 @@ export function getWarehousebills(fId) {
   })
 }
 
+export function listElabelByfGPid(fGPid) {
+  return request({
+    url: '/warehouseBusiness/inStock/selectElabelList/' + fGPid,
+    method: 'get'
+  })
+}
+
 // 新增仓库主(出入库保存)
 export function addWarehousebills(data) {
   return request({

src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -473,6 +473,7 @@
             <el-table-column label="序号" type="index" width="80" fixed />
             <el-table-column
               v-for="(item, index) in getRowList"
+              v-if="item.show"
               :key="index"
               :label="item.name"
               :width="item.width"
@@ -1571,6 +1572,7 @@
         <el-table-column type="selection" width="50"> </el-table-column>
         <el-table-column
           v-for="(item, index) in getRowList2"
+          v-if="item.show"
           :key="index"
           :label="item.name"
           :width="item.width"
@@ -2680,6 +2682,23 @@ export default {
       this.fStorageTypeOptions = response.data;
       localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
     });
+    this.getConfigKey("show.data_elabel").then((response) => {
+      if (response.msg === '0') {
+        this.getRowList.forEach(item => {
+          this.$set(item, 'show', true);
+        })
+        this.getRowList2.forEach(item => {
+          this.$set(item, 'show', true);
+        })
+      } else {
+        this.getRowList.forEach(item => {
+          this.$set(item, 'show', item.label == 'fElabel'? false: true);
+        })
+        this.getRowList2.forEach(item => {
+          this.$set(item, 'show', item.label == 'fElabel'? false: true);
+        })
+      }
+    });
     this.getConfigKey("warehouse.show.invoice").then((response) => {
       this.isShowInvoice = response.msg;
     });

src/views/Warehousing/inStock/elabelList.vue

@@ -0,0 +1,64 @@
+<template>
+  <!--  点击查看电子标签  -->
+  <el-dialog title="电子标签" :visible.sync="showElabelDialog" width="40%" :close-on-click-modal="false">
+    <span>
+      <el-table :data="elabelList" v-loading="loading" element-loading-text="努力加载中">
+      <el-table-column
+        label="序号"
+        type="index"
+        width="50"
+        fixed
+        align="center"
+      />
+      <el-table-column
+        prop="fContent"
+        align="center"
+        width="140px"
+        label="电子标签"
+      />
+    </el-table>
+    </span>
+    <span slot="footer" class="dialog-footer">
+        <el-button @click="showElabelDialog = false">取 消</el-button>
+      </span>
+  </el-dialog>
+</template>
+
+<script>
+import { listElabelByfGPid } from '@/api/warehouseBusiness/warehouseInStock'
+
+export default {
+  name: 'elabelList',
+  props: {
+    elabelListVisible: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data () {
+    return {
+      elabelList: [],
+      showElabelDialog: false,
+      loading: false,
+      form: {},
+    }
+  },
+  methods: {
+    init(row) {
+      this.form = row;
+      listElabelByfGPid(row.fId).then((response) => {
+        this.elabelList = response.data.elabelList;
+      });
+    },
+  },
+  watch: {
+    elabelListVisible () {
+      this.showElabelDialog = this.elabelListVisible;
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/Warehousing/inStock/uploadExcel.vue

@@ -59,6 +59,7 @@
         />
         <el-table-column
           v-for="(item, index) in getRowList"
+          v-if="item.show"
           :key="index"
           :label="item.name"
           :width="item.width"
@@ -158,7 +159,7 @@
                 placeholder="包装规格"
               />
             </span>
-            <span v-else-if="item.label == 'fElabel'">
+            <span v-else-if="item.label == 'fElabel'" v-show="showDataElabel == '0'">
               <el-input
                 v-model="scope.row.fElabel"
                 style="width: 100%"
@@ -423,6 +424,7 @@ export default {
       oldList: [],
       form: {},
       selection: [],
+      showDataElabel: null,
     };
   },
   created() {
@@ -434,6 +436,18 @@ export default {
     this.getDicts("storage_type").then((response) => {
       this.fStorageTypeOptions = response.data;
     });
+    this.getConfigKey("show.data_elabel").then((response) => {
+      this.showDataElabel = response.msg;
+      if (this.showDataElabel === '0') {
+        this.getRowList.forEach(item => {
+          this.$set(item, 'show', true);
+        })
+      } else {
+        this.getRowList.forEach(item => {
+          this.$set(item, 'show', item.label == 'fElabel'? false: true);
+        })
+      }
+    });
     this.getRow();
   },
   methods: {

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -964,6 +964,7 @@
             <el-table-column label="序号" type="index" width="80" fixed/>
             <el-table-column
               v-for="(item, index) in getRowList"
+              v-if="item.show"
               :key="index"
               :label="item.name"
               :width="item.width"
@@ -2852,6 +2853,7 @@
             <el-table-column type="selection" width="50"></el-table-column>
             <el-table-column
               v-for="(item, index) in getRowList2"
+              v-if="item.show"
               :key="index"
               :label="item.name"
               :width="item.width"
@@ -2926,6 +2928,7 @@
             <el-table-column type="index" width="50" label="#"></el-table-column>
             <el-table-column
               v-for="(item, index) in getRowList2"
+              v-if="item.show"
               :key="index"
               :label="item.name"
               :width="item.width"
@@ -6253,6 +6256,23 @@ export default {
         this.detailsHidden2 = true
       }
     })
+    this.getConfigKey("show.data_elabel").then((response) => {
+      if (response.msg === '0') {
+        this.getRowList.forEach(item => {
+          this.$set(item, 'show', true);
+        })
+        this.getRowList2.forEach(item => {
+          this.$set(item, 'show', true);
+        })
+      } else {
+        this.getRowList.forEach(item => {
+          this.$set(item, 'show', item.label == 'fElabel'? false: true);
+        })
+        this.getRowList2.forEach(item => {
+          this.$set(item, 'show', item.label == 'fElabel'? false: true);
+        })
+      }
+    });
     selectUserByRole().then(res => {
       this.fSalesmanId = res.rows
     })

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -856,6 +856,7 @@
             <el-table-column label="序号" type="index" width="80" fixed />
             <el-table-column
               v-for="(item, index) in getRowList"
+              v-if="item.show"
               :key="index"
               :label="item.name"
               :width="item.width"
@@ -2466,6 +2467,7 @@
         <el-table-column type="selection" width="50"> </el-table-column>
         <el-table-column
           v-for="(item, index) in getRowList2"
+          v-if="item.show"
           :key="index"
           :label="item.name"
           :width="item.width"
@@ -4303,6 +4305,23 @@ export default {
       this.fStorageTypeOptions = response.data;
       localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
     });
+    this.getConfigKey("show.data_elabel").then((response) => {
+      if (response.msg === '0') {
+        this.getRowList.forEach(item => {
+          this.$set(item, 'show', true);
+        })
+        this.getRowList2.forEach(item => {
+          this.$set(item, 'show', true);
+        })
+      } else {
+        this.getRowList.forEach(item => {
+          this.$set(item, 'show', item.label == 'fElabel'? false: true);
+        })
+        this.getRowList2.forEach(item => {
+          this.$set(item, 'show', item.label == 'fElabel'? false: true);
+        })
+      }
+    });
     this.getConfigKey('entry.printing').then((response) => {
       this.entryPrinting = response.msg
     })