1.电子标签相关~

src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -2499,6 +2499,13 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "26",
+          label: "fElabel",
+          name: "电子标签",
+          checked: 0,
+          width: 100,
+        },
       ],
       setRowList: [],
       getRowList: [],
@@ -2597,6 +2604,13 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "14",
+          label: "fElabel",
+          name: "电子标签",
+          checked: 0,
+          width: 100,
+        },
       ],
       setRowList2: [],
       getRowList2: [],
@@ -3136,6 +3150,7 @@ export default {
           fSrcid: e.fId,
           fSrcBsdate: e.fBsdate,
           fShipper: e.fShipper,
+          fElabel: e.fElabel,
         });
       });
       this.whgenlegVisible = false;

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -1270,13 +1270,20 @@
                 下载模板
               </el-button>
               <el-button size="small" type="primary" @click="openUploadExcel"
-              >导入Execl
+              >导入Excel
               </el-button
               >
               <el-button v-if="true" type="success" size="small" @click="openNoUpload" :disabled="browseStatus">智能大数据</el-button>
             </el-col>
             <el-col style="display: flex; justify-content: flex-end">
               <el-button
+                type="primary"
+                size="small"
+                @click="showElabel"
+                v-show="showDataElabel == '0'"
+              >查看电子标签
+              </el-button>
+              <el-button
                   size="small"
                   type="info"
                   prop="打印"
@@ -1892,10 +1899,10 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item label="电子标签" prop="fELabel">
+            <el-col :span="6" v-show="showDataElabel == '0'">
+              <el-form-item label="电子标签" prop="fElabel">
                 <el-input
-                  v-model="importList.fELabel"
+                  v-model="importList.fElabel"
                   style="width: 100%"
                   placeholder="电子标签"
                 />
@@ -6662,7 +6669,7 @@ export default {
         },
         {
           surface: "16",
-          label: "fELabel",
+          label: "fElabel",
           name: "电子标签",
           checked: 0,
           width: 100,
@@ -6818,6 +6825,7 @@ export default {
       noUploadVisible: false, //上传弹窗
       bigDataToken: null,
       signature: null, //打印时候的电子签章
+      showDataElabel: null,
     };
   },
   created() {
@@ -6861,6 +6869,9 @@ export default {
     this.getDicts("data_ifweigh_status").then((response) => {
       this.ifweightRecoveryList = response.data;
     });
+    this.getConfigKey("show.data_elabel").then((response) => {
+      this.showDataElabel = response.msg;
+    });
     this.getConfigKey("bigData.token").then((response) => {
       this.bigDataToken = response.msg;
     });
@@ -7150,7 +7161,7 @@ export default {
         fCntrtype: null,
         fCntqty: 1,
         fPackagespecs: null,
-        fELabel: null,
+        fElabel: null,
         fTruckno: null,
         fDriverName: null,
         fDriverTel: null,
@@ -8389,7 +8400,7 @@ export default {
             fCntrtype: this.importList.fCntrtype,
             fCntqty: this.importList.fCntqty,
             fPackagespecs: this.importList.fPackagespecs,
-            fELabel: this.importList.fELabel,
+            fElabel: this.importList.fElabel,
             fTruckno: this.importList.fTruckno,
             fDriverName: this.importList.fDriverName,
             fDriverTel: this.importList.fDriverTel,
@@ -8688,7 +8699,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.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,9 +158,9 @@
                 placeholder="包装规格"
               />
             </span>
-            <span v-else-if="item.label == 'fELabel'">
+            <span v-else-if="item.label == 'fElabel'">
               <el-input
-                v-model="scope.row.fELabel"
+                v-model="scope.row.fElabel"
                 style="width: 100%"
                 placeholder="电子标签"
               />
@@ -393,7 +393,7 @@ export default {
         },
         {
           surface: "10",
-          label: "fELabel",
+          label: "fElabel",
           name: "电子标签",
           checked: 0,
           width: 100,

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -924,6 +924,7 @@
                   <el-dropdown-item command="f">叉车出库单</el-dropdown-item>
                   <el-dropdown-item command="w">叉车出库单(空白)</el-dropdown-item>
                   <el-dropdown-item command="g">单车出库单</el-dropdown-item>
+                  <el-dropdown-item command="gw">单车出库单(空白)</el-dropdown-item>
                   <el-dropdown-item command="h">装车存档出库单</el-dropdown-item>
                   <el-dropdown-item command="hw">装车存档出库单(空白)</el-dropdown-item>
                   <el-dropdown-item command="q">签收单</el-dropdown-item>
@@ -4375,6 +4376,119 @@
       </span>
     </el-dialog>
     <el-dialog
+      :visible.sync="print_dcckd_blank"
+      width="70%"
+      :close-on-click-modal="false"
+      :modal="false"
+    >
+      <el-radio v-model="radio" :label="1">吨（T）</el-radio>
+      <el-radio v-model="radio" :label="2">千克（KG）</el-radio>
+      <div id="print_area7_1" class="print-div">
+        <div
+          class="print-title"
+          style="
+            display: flex;
+            justify-content: center;
+            font-size: 24px;
+            margin-bottom: 5px;
+          "
+        >
+          {{ fCompanyName ? fCompanyName : company }}
+        </div>
+
+        <div
+          style="
+            margin-bottom: 5px;
+            width: 100%;
+            position: relative;
+          "
+        >
+          <div style="font-size: 18px;text-align: center">出&nbsp;库&nbsp;单</div>
+          <div style="position: absolute;right: 5px;bottom: 5px;">
+            <div style="margin-bottom: 5px">{{ form.fBillno }}</div>
+          </div>
+        </div>
+        <div style="display: flex;justify-content: space-between; margin-bottom: 5px">
+          <div style="width: 50%">客户名称：{{ form.fCorpidName }}</div>
+          <div>存放地点：{{ stockName }}</div>
+        </div>
+        <div class="print_table" style="display: flex">
+          <table
+            border="0"
+            cellspacing="0"
+            cellpadding="0"
+            style="width: 100%; line-height: 30px"
+          >
+            <tr>
+              <td>品名</td>
+              <td colspan="3">{{ form.fProductName }}</td>
+              <td>清单号</td>
+              <td colspan="4">{{ form.fCustomsdeclartion }}</td>
+            </tr>
+            <tr>
+              <td>提单号</td>
+              <td colspan="3">{{ form.fMblno }}</td>
+              <td>出库日期</td>
+              <td colspan="4">{{ fBsdate }}</td>
+            </tr>
+            <tr>
+              <td>原入库箱号</td>
+              <td>属性详情</td>
+              <td>出库车号</td>
+              <td>铅封号</td>
+              <td>垛位</td>
+              <td>件数</td>
+              <td v-if="radio == 1">净重(吨)</td>
+              <td v-if="radio == 1">毛重(吨)</td>
+              <td v-if="radio == 2">净重(千克)</td>
+              <td v-if="radio == 2">毛重(千克)</td>
+              <td>备注</td>
+            </tr>
+            <tr v-for="(item, index) in Printinglist" :key="index">
+              <td>{{ item.fCntrno }}</td>
+              <td>{{ item.fMarks }}</td>
+              <td></td>
+              <td>{{ item.fSealno }}</td>
+              <td>{{ item.fWarehouseInformation }}</td>
+              <td></td>
+              <td v-if="radio == 1"></td>
+              <td v-if="radio == 1"></td>
+              <td v-if="radio == 2"></td>
+              <td v-if="radio == 2"></td>
+              <td>{{ item.remark }}</td>
+            </tr>
+            <tr>
+              <td colspan="5">合计：</td>
+              <td></td>
+              <td v-if="radio == 1"></td>
+              <td v-if="radio == 1"></td>
+              <td v-if="radio == 2"></td>
+              <td v-if="radio == 2"></td>
+              <td></td>
+            </tr>
+          </table>
+        </div>
+        <div
+          style="display: flex; justify-content: space-between; font-size: 12px"
+        >
+          <div>库管：{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
+          <div style="width: 100px">初审核人：{{ firstReviewer }}</div>
+          <div style="width: 130px;margin-right: 20px">复式审核人：{{ secondReviewer }}</div>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button
+          type="primary"
+          @click="
+            addprint('dcckd');
+            print_dcckd_blank = false;
+          "
+        >打印
+        </el-button>
+        <el-button @click="print_dcckd_blank = false">取消 </el-button>
+      </span>
+    </el-dialog>
+    <el-dialog
       :visible.sync="print_zccdckd"
       width="70%"
       :close-on-click-modal="false"
@@ -5279,6 +5393,7 @@ export default {
       print_dpxx: false,
       print_ccckd: false,
       print_dcckd: false,
+      print_dcckd_blank: false,
       print_zccdckd: false,
       print_bzckd: false,
       print_xqckd: false,
@@ -8807,7 +8922,10 @@ export default {
                 if (this.Printinglist[i].fTruckno !== this.Printinglist[0].fTruckno) return this.$message.error('请选择相同的车号')
               }
               this.print_dcckd = true
-            } else if (command == 'h') {
+            } else if (command == 'gw') {
+              this.print_dcckd_blank = true
+            }
+            else if (command == 'h') {
               this.print_zccdckd = true
             } else if (command == 'i') {
               let date = new Date()

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -4110,6 +4110,13 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "31",
+          label: "fElabel",
+          name: "电子标签",
+          checked: 0,
+          width: 100,
+        },
       ],
       setRowList: [],
       getRowList: [],
@@ -4208,6 +4215,13 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "14",
+          label: "fElabel",
+          name: "电子标签",
+          checked: 0,
+          width: 100,
+        },
       ],
       setRowList2: [],
       getRowList2: [],
@@ -4742,6 +4756,7 @@ export default {
           fSrcid: e.fId,
           fSrcBsdate: e.fBsdate,
           fShipper: e.fShipper,
+          fElabel: e.fElabel,
         });
       });
       this.whgenlegVisible = false;

src/views/basicdata/goods/index.vue

@@ -723,7 +723,7 @@ export default {
         },
         {
           surface: "13",
-          label: "fEmsSeqNo",
+          label: "fWmsDclUnit",
           name: "申报单位",
           checked: 0,
           width: 100,