1.电子标签相关~

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -1892,6 +1892,15 @@
                 />
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="电子标签" prop="fELabel">
+                <el-input
+                  v-model="importList.fELabel"
+                  style="width: 100%"
+                  placeholder="电子标签"
+                />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col>
@@ -6653,104 +6662,111 @@ export default {
         },
         {
           surface: "16",
+          label: "fELabel",
+          name: "电子标签",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "17",
           label: "fFleet",
           name: "车队",
           checked: 0,
           width: 100,
         },
         {
-          surface: "17",
+          surface: "18",
           label: "fTruckno",
           name: "车号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "18",
+          surface: "19",
           label: "fDriverName",
           name: "司机名称",
           checked: 0,
           width: 100,
         },
         {
-          surface: "19",
+          surface: "20",
           label: "fDriverTel",
           name: "司机电话",
           checked: 0,
           width: 100,
         },
         {
-          surface: "20",
+          surface: "21",
           label: "fDriverIdCar",
           name: "司机身份证",
           checked: 0,
           width: 120,
         },
         {
-          surface: "21",
+          surface: "22",
           label: "fSerialNumber",
           name: "流水号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "22",
+          surface: "23",
           label: "fCntrno",
           name: "箱号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "23",
+          surface: "24",
           label: "fLntype",
           name: "装卸方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "24",
+          surface: "25",
           label: "fForkliftman",
           name: "叉车工",
           checked: 0,
           width: 100,
         },
         {
-          surface: "25",
+          surface: "26",
           label: "fStevedore",
           name: "装卸工",
           checked: 0,
           width: 100,
         },
         {
-          surface: "26",
+          surface: "27",
           label: "fLocalcntrno",
           name: "库内箱号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "27",
+          surface: "28",
           label: "fSealno",
           name: "封号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "28",
+          surface: "29",
           label: "fGoodsval",
           name: "货值",
           checked: 0,
           width: 100,
         },
         {
-          surface: "29",
+          surface: "30",
           label: "fChargedate",
           name: "仓储费日期",
           checked: 0,
           width: 100,
         },
         {
-          surface: "30",
+          surface: "31",
           label: "remark",
           name: "备注",
           checked: 0,
@@ -7134,6 +7150,7 @@ export default {
         fCntrtype: null,
         fCntqty: 1,
         fPackagespecs: null,
+        fELabel: null,
         fTruckno: null,
         fDriverName: null,
         fDriverTel: null,
@@ -8372,6 +8389,7 @@ export default {
             fCntrtype: this.importList.fCntrtype,
             fCntqty: this.importList.fCntqty,
             fPackagespecs: this.importList.fPackagespecs,
+            fELabel: this.importList.fELabel,
             fTruckno: this.importList.fTruckno,
             fDriverName: this.importList.fDriverName,
             fDriverTel: this.importList.fDriverTel,
@@ -8670,6 +8688,7 @@ export default {
             this.importList.fWarehouselocid = this.Printinglist[0].fWarehouselocid;
             this.importList.fWarehouseInformation = this.Printinglist[0].fWarehouseInformation;
             this.importList.fPackagespecs = this.Printinglist[0].fPackagespecs;
+            this.importList.fELabel = this.Printinglist[0].fELabel;
             this.importList.fCntrtype = Number(this.Printinglist[0].fCntrtype);
             this.importList.fCntqty = this.Printinglist[0].fCntqty;
             this.importList.fTruckno = this.Printinglist[0].fTruckno;

src/views/Warehousing/inStock/uploadExcel.vue

@@ -158,6 +158,13 @@
                 placeholder="包装规格"
               />
             </span>
+            <span v-else-if="item.label == 'fELabel'">
+              <el-input
+                v-model="scope.row.fELabel"
+                style="width: 100%"
+                placeholder="电子标签"
+              />
+            </span>
             <span v-else-if="item.label == 'fCntrno'">
               <el-input
                 v-model="scope.row.fCntrno"
@@ -386,13 +393,20 @@ export default {
         },
         {
           surface: "10",
+          label: "fELabel",
+          name: "电子标签",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "11",
           label: "fCntrno",
           name: "箱号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "11",
+          surface: "12",
           label: "fTruckno",
           name: "车号",
           checked: 0,

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -5455,131 +5455,138 @@ export default {
           width: 100
         },
         {
-          surface: '14',
+          surface: "14",
+          label: "fELabel",
+          name: "电子标签",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: '15',
           label: 'fCntrtype',
           name: '箱型',
           checked: 0,
           width: 100
         },
         {
-          surface: '15',
+          surface: '16',
           label: 'fCntqty',
           name: '箱量',
           checked: 0,
           width: 100
         },
         {
-          surface: '16',
+          surface: '17',
           label: 'fCntrno',
           name: '箱号',
           checked: 0,
           width: 100
         },
         {
-          surface: '17',
+          surface: '18',
           label: 'fShipper',
           name: '发货方',
           checked: 0,
           width: 100
         },
         {
-          surface: '18',
+          surface: '19',
           label: 'fGoodsval',
           name: '货值',
           checked: 0,
           width: 100
         },
         {
-          surface: '19',
+          surface: '20',
           label: 'fFleet',
           name: '车队',
           checked: 0,
           width: 100
         },
         {
-          surface: '20',
+          surface: '21',
           label: 'fTruckno',
           name: '车号',
           checked: 0,
           width: 100
         },
         {
-          surface: '21',
+          surface: '22',
           label: 'fDriverName',
           name: '司机名称',
           checked: 0,
           width: 100
         },
         {
-          surface: '22',
+          surface: '23',
           label: 'fDriverTel',
           name: '司机电话',
           checked: 0,
           width: 100
         },
         {
-          surface: '23',
+          surface: '24',
           label: 'fDriverIdCar',
           name: '司机身份证',
           checked: 0,
           width: 150
         },
         {
-          surface: '24',
+          surface: '25',
           label: 'fIsPass',
           name: '是否放行',
           checked: 0,
           width: 150
         },
         {
-          surface: '25',
+          surface: '26',
           label: 'fLntype',
           name: '装卸方式',
           checked: 0,
           width: 100
         },
         {
-          surface: '26',
+          surface: '27',
           label: 'fForkliftman',
           name: '叉车工',
           checked: 0,
           width: 100
         },
         {
-          surface: '27',
+          surface: '28',
           label: 'fLocalcntrno',
           name: '库内箱号',
           checked: 0,
           width: 100
         },
         {
-          surface: '28',
+          surface: '29',
           label: 'fSealno',
           name: '封号',
           checked: 0,
           width: 100
         },
         {
-          surface: '29',
+          surface: '30',
           label: 'fSerialNumber',
           name: '流水号',
           checked: 0,
           width: 100
         },
         {
-          surface: '30',
+          surface: '31',
           label: 'remark',
           name: '备注',
           checked: 0,
           width: 100
         }, {
-          surface: '31',
+          surface: '32',
           label: 'fNowCarton',
           name: '现箱号',
           checked: 0,
           width: 100
         }, {
-          surface: '32',
+          surface: '33',
           label: 'fCartypeId',
           name: '车辆类型',
           checked: 0,
@@ -5683,6 +5690,13 @@ export default {
           name: '库内箱号',
           checked: 0,
           width: 100
+        },
+        {
+          surface: '14',
+          label: 'fElabel',
+          name: '电子标签',
+          checked: 0,
+          width: 100
         }
       ],
       setRowList2: [],
@@ -6650,6 +6664,7 @@ export default {
                 fOriginalbilldate: e.fOriginalbilldate,
                 fOriginalbillno: e.fOriginalbillno,
                 fPackagespecs: e.fPackagespecs,
+                fELabel: e.fELabel,
                 fGrossweight: e.fGrossweightblc2,
                 fNetweight: e.fNetweightblc2,
                 fQty: e.fQtyblc2,
@@ -6695,6 +6710,7 @@ export default {
               fOriginalbilldate: e.fOriginalbilldate,
               fOriginalbillno: e.fOriginalbillno,
               fPackagespecs: e.fPackagespecs,
+              fELabel: e.fELabel,
               fGrossweight: e.fGrossweightblc2,
               fNetweight: e.fNetweightblc2,
               fQty: e.fQtyblc2,
@@ -6750,6 +6766,7 @@ export default {
                 fOriginalbilldate: e.fOriginalbilldate,
                 fOriginalbillno: e.fOriginalbillno,
                 fPackagespecs: e.fPackagespecs,
+                fELabel: e.fELabel,
                 fGrossweight: e.fGrossweightblc2,
                 fNetweight: e.fNetweightblc2,
                 fQty: e.fQtyblc2,
@@ -6795,6 +6812,7 @@ export default {
               fOriginalbilldate: e.fOriginalbilldate,
               fOriginalbillno: e.fOriginalbillno,
               fPackagespecs: e.fPackagespecs,
+              fELabel: e.fELabel,
               fGrossweight: e.fGrossweightblc2,
               fNetweight: e.fNetweightblc2,
               fQty: e.fQtyblc2,

src/views/index.vue

@@ -58,7 +58,7 @@
               </div>
               <p>库间调拨</p>
             </li>
-            <li @click="smartScreen()">
+            <li @click="smartScreen()" v-if="showDataCenter == 0">
               <div>
                 <i
                     class="el-icon-s-order"
@@ -934,6 +934,7 @@ export default {
         noticeContent: ''
       },
       remindList: [],
+      showDataCenter: "0",
     };
   },
   filters: {
@@ -974,6 +975,9 @@ export default {
     this.getConfigKey("data_print_title").then((response) => {
       Cookies.set("companyName", response.msg);
     });
+    this.getConfigKey("show.data_center").then((response) => {
+      this.showDataCenter = response.msg;
+    });
     this.sysType = Cookies.get("sysType");
     if (this.sysType == 2) {
       queryHomeInfo().then((response) => {
@@ -1231,7 +1235,7 @@ export default {
               }
             })
             return res
-            
+
        }
         },
         yAxis: {