【新增】到货通知

src/layout/components/Navbar.vue

@@ -16,7 +16,12 @@
           ></i>
         </el-tooltip>
       </div> -->
-
+      <div class="right-menu-item hover-effect" @click="isNotice=!isNotice" style="display: flex;">
+        <el-badge value="示">
+          <i class="el-icon-message-solid" style="font-size: 24px; line-height: 50px"></i>
+        </el-badge>
+        <span style="font-size: 16px; margin-left: 15px;">到货通知</span>
+      </div>
       <div class="right-menu-item hover-effect" @click="toEngine">
         <i class="el-icon-s-platform" style="font-size: 18px;"></i>
         <span style="font-size: 16px; margin-left: 6px;">家用工程机登录</span>
@@ -62,6 +67,32 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog title="到货通知" :modal="false" :visible.sync="isNotice" center >
+      <el-table :data="[]">
+        <el-table-column property="date" label="产品编号" ></el-table-column>
+        <el-table-column property="name" label="物料编码" ></el-table-column>
+        <el-table-column property="address" label="产品名称"></el-table-column>
+        <el-table-column property="address" label="规格型号"></el-table-column>
+        <el-table-column property="address" label="到货仓库"></el-table-column>
+        <el-table-column property="address" label="到货通知时间"></el-table-column>
+      </el-table>
+      <div class="flex">
+        <div></div>
+        <div class="fr">
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-sizes="[10, 20, 30, 50]"
+            :page-size="10"
+            layout="total, prev, pager, next"
+            :total="listTotal"
+          >
+          </el-pagination>
+        </div>
+      </div>
+  </el-dialog>
     <!--    工程机多帐号-->
     <!--    <el-dialog-->
     <!--      title="绑定工程机系统"-->
@@ -121,8 +152,9 @@ import Screenfull from "@/components/Screenfull";
 import NavMenu from "@/components/NavMenu";
 import { getNoticeListCount } from "@/api/notice";
 import { bindEngineAccount, checkEngineAccount } from "@/api/setting";
-
+import mixin from '@/mixin'
 export default {
+  mixins:[mixin],
   data() {
     return {
       intivalId: "",
@@ -148,6 +180,7 @@ export default {
       wsConnectErrorTime: 1,
       websock: null,
       lockReconnect: false,
+      isNotice:false
     };
   },
   mounted() {
@@ -191,6 +224,10 @@ export default {
     ...mapGetters(["sidebar", "avatar", "device", "name"]),
   },
   methods: {
+    getList(){
+
+    }
+,
     toggleSideBar() {
       this.$store.dispatch("app/toggleSideBar");
     },
@@ -418,7 +455,15 @@ export default {
 
 <style lang="scss" scoped>
 @import "~@/styles/variables.scss";
-
+::v-deep .is-fixed{
+  right: 10px !important;
+}
+.flex{
+  margin-top: 30px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
 .navbar {
   width: 100%;
   height: 50px;

src/mixin/print.js

@@ -109,7 +109,7 @@ export default {
      * 获取需要打印数据详情
      * @param {Array} ids
      */
-    async getDateil(ids, funcType = "getDeliverDetail") {
+    async getDateil(ids, funcType = "getDeliverDetail",check=null) {
       this.$startLoading();
       let loadingLen;
       // 兼容多个打印数据
@@ -142,7 +142,7 @@ export default {
           loadingLen = data.length;
           for (let i = data.length; i > 0; i--) {
             const newData = data[i - 1];
-            await this.setPrintData(newData,funcType);
+            await this.setPrintData(newData,funcType,check);
             loadingLen--;
           }
         } catch (error) {
@@ -273,7 +273,7 @@ export default {
      * @param {object} data
      * this.outputData 打印数据
      */
-    setPrintData(data,funcType) {
+    setPrintData(data,funcType,check) {
       let salesOrderId, invoiceId; //出库单号，发货单号 默认数据中的第一个
       salesOrderId = data.invoicePickBeans[0].salesOrderId;
       invoiceId = data.invoicePickBeans[0].invoiceId;
@@ -352,8 +352,8 @@ export default {
           nowDate: this.nowDate(),
           takerName:
             data.type === 2
-              ? `退货人：${tuiHuoRen || ""}`
-              : `提货人：${data.takerName || ""}`,
+              ? `退货人：${check ==0 ?data.pickLogistics||'':tuiHuoRen || ""}`
+              : `提货人：${check ==0 ?data.pickLogistics||'':data.takerName || ""}`,
           customerName: data.customerName || "",
           correspondName: data.correspondName,
           correspondNames: "",

src/views/supply/implement/nsales_list.vue

@@ -147,7 +147,7 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="推送状态" prop="syncStatus">
+              <el-form-item label="金蝶推送状态" prop="syncStatus">
                 <el-select v-model="screenForm.syncStatus" clearable filterable>
                   <el-option label="未推送" :value="0"> </el-option>
                   <el-option label="推送成功" :value="1"> </el-option>
@@ -194,7 +194,7 @@
             <!-- <el-table-column align="center" type="selection" width="55"></el-table-column>-->
             <el-table-column
               align="left"
-              label="推送状态"
+              label="金蝶推送状态"
               prop="syncStatus"
               min-width="100"
               show-overflow-tooltip

src/views/supply/pickup/check.vue

@@ -864,7 +864,7 @@ export default {
           }
         });
       } else {
-        this.getDateil(this.tableSelection, "getDtailPrintDis").then((res) => {
+        this.getDateil(this.tableSelection, "getDtailPrintDis",this.check).then((res) => {
           this.$endLoading();
           this.$refs.preView.show(this.hiprintTemplate, this.outputData);
         });
@@ -886,7 +886,7 @@ export default {
             password: this.dialogForm.password,
           };
           checkPassword(params).then((res) => {
-            this.getDateil(this.tableSelection, "getDtailPrintDis").then(
+            this.getDateil(this.tableSelection, "getDtailPrintDis",this.check).then(
               (res) => {
                 this.$endLoading();
                 this.$refs.preView.show(this.hiprintTemplate, this.outputData);

src/views/supply/sales/sales_list.vue

@@ -159,7 +159,7 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="推送状态" prop="syncStatus">
+              <el-form-item label="金蝶推送状态" prop="syncStatus">
                 <el-select v-model="screenForm.syncStatus" clearable filterable>
                   <el-option label="未推送" :value="0"> </el-option>
                   <el-option label="推送成功" :value="1"> </el-option>
@@ -228,7 +228,7 @@
             ></el-table-column>
             <el-table-column
               align="left"
-              label="推送状态"
+              label="金蝶推送状态"
               prop="syncStatus"
               min-width="100"
               show-overflow-tooltip