Merge branch 'feature/Feature-copy' into develop

src/layout/components/Navbar.vue

@@ -16,7 +16,12 @@
           ></i>
         </el-tooltip>
       </div> -->
-
+      <!-- <div class="right-menu-item hover-effect" @click="handleNotice"  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 @close="handleNotice">
+      <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: "",
@@ -188,9 +220,15 @@ export default {
     noticeVisible() {
       return this.noticeCount > 0;
     },
-    ...mapGetters(["sidebar", "avatar", "device", "name"]),
+    ...mapGetters(["sidebar", "avatar", "device", "name","isNotice"]),
   },
   methods: {
+    getList(){
+    }
+    ,
+    handleNotice(){
+      this.$store.commit("user/SET_STATUS",!this.isNotice);
+    },
     toggleSideBar() {
       this.$store.dispatch("app/toggleSideBar");
     },
@@ -418,7 +456,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/store/getters.js

@@ -7,6 +7,7 @@ const getters = {
   userid: (state) => state.user.userid,
   phone: (state) => state.user.phone,
   name: (state) => state.user.name,
+  isNotice:(state) =>state.user.isNotice,
   menus: (state) => state.user.menus,
   customerId: (state) => state.user.customerId,
   customerName: (state) => state.user.customerName,

src/store/modules/user.js

@@ -20,6 +20,7 @@ const getDefaultState = () => {
     customerName: "", //经销商名称
     customerNumber: "", //经销商编码
     showMessages: null, //
+    isNotice:false
   };
 };
 
@@ -29,6 +30,9 @@ const mutations = {
   RESET_STATE: (state) => {
     Object.assign(state, getDefaultState());
   },
+  SET_STATUS(state,status){
+    state.isNotice = status
+  },
   SET_USERID: (state, userid) => {
     state.userid = userid;
   },
@@ -58,6 +62,7 @@ const mutations = {
       state.showMessages = true;
     } else {
       state.showMessages = false;
+      state.isNotice = false
     }
   },
 };

src/views/supply/engin/components/commerce_detail.vue

@@ -13,7 +13,7 @@
         <div class="diy-table-1">
           <el-row>
             <el-col :span="8" class="item">
-              <div class="label">工程登录编号</div>
+              <div class="label">工程订单号</div>
               <div class="value">{{detailData.enginOrderNo}}</div>
             </el-col>
             <el-col :span="8" class="item">
@@ -37,7 +37,7 @@
               <div class="value">{{detailData.refMachineType}}</div>
             </el-col>
             <el-col :span="8" class="item">
-              <div class="label">工程订单号</div>
+              <div class="label">工程登录编号</div>
               <div class="value">{{detailData.refEnginRecordNo}}</div>
             </el-col>
             <el-col :span="8" class="item">
@@ -221,7 +221,7 @@
         <div class="footer">
           <el-button type="success" @click="toCheckOrder">联查单据</el-button>
           <el-button type="danger" @click="closeData" v-if="detailData.examineStatus === 'SAVE' || detailData.examineStatus === 'WAIT'">关闭订单</el-button>
-          <el-button type="primary" @click="openDirectDialog" v-if="!isDealer">提前开票</el-button>
+          <!-- <el-button type="primary" @click="openDirectDialog" v-if="!isDealer">提前开票</el-button> -->
           <el-button type="primary" @click="overData" v-if="!isDealer">直调完结</el-button>
           <el-button type="primary" @click="openDeliverDialog" :disabled="detailData.directTransferStatus" v-if="!isDealer">直调发货</el-button>
           <el-button @click="goBack">返回列表</el-button>

src/views/supply/engin/components/commerce_examine.vue

@@ -9,7 +9,7 @@
     <div class="diy-table-1">
       <el-row>
         <el-col :span="8" class="item">
-          <div class="label">工程登录编号</div>
+          <div class="label">工程订单号</div>
           <div class="value">{{detailData.enginOrderNo}}</div>
         </el-col>
         <el-col :span="8" class="item">
@@ -33,7 +33,7 @@
               <div class="value">{{detailData.refMachineType}}</div>
             </el-col>
         <el-col :span="8" class="item">
-          <div class="label">工程订单号</div>
+          <div class="label">工程登录编号</div>
           <div class="value">{{detailData.refEnginRecordNo}}</div>
         </el-col>
         <el-col :span="8" class="item">

src/views/supply/engin/components/commerce_form.vue

@@ -179,7 +179,7 @@
     <div class="main-title">
       <div class="title">货品信息</div>
       <div>
-        <el-select v-model="warehouseValue" placeholder="请选择发货仓库" size="small" style="margin-right: 10px"  @change="setStock">
+        <el-select v-model="warehouseValue" placeholder="请选择发货仓库" size="small" style="margin-right: 10px"  @change="setStock" :disabled="!flag">
           <el-option :label="item.name" :value="item.id" v-for="(item, index) in warehouseList" :key="index"></el-option>
         </el-select>
         <el-button type="primary" size="small" icon="el-icon-search" @click="checkStock">检查库存</el-button>
@@ -438,6 +438,7 @@ export default {
         createDate: '',
         fileNo: '',
         salesMan: '',
+
         examineRemark: '',
       },
       mainFormRules: {
@@ -475,7 +476,7 @@ export default {
 
       warehouseList: [],
       warehouseValue: '',
-
+      flag:false,
       isFirst: false,
       salesmanList: [],
     }
@@ -514,12 +515,14 @@ export default {
     goodsList: {
       handler(newValue, oldValue) {
         if(this.goodsList && this.goodsList.length) {
+            this.flag = true
           if(this.isFirst) {
             this.isFirst = false;
           }else {
             // this.mainForm.salesMan = this.goodsList[0].serviceId;
           }
         }else {
+          this.flag = false
           this.mainForm.salesMan = '';
         }
       },

src/views/supply/engin/components/commerce_return.vue

@@ -9,7 +9,7 @@
     <div class="diy-table-1">
       <el-row>
         <el-col :span="8" class="item">
-          <div class="label">工程登录编号</div>
+          <div class="label">工程订单号</div>
           <div class="value">{{detailData.enginOrderNo}}</div>
         </el-col>
         <el-col :span="8" class="item">
@@ -33,7 +33,7 @@
               <div class="value">{{detailData.refMachineType}}</div>
             </el-col>
         <el-col :span="8" class="item">
-          <div class="label">工程订单号</div>
+          <div class="label">工程登录编号</div>
           <div class="value">{{detailData.refEnginRecordNo}}</div>
         </el-col>
         <el-col :span="8" class="item">

src/views/supply/engin/components/home_detail.vue

@@ -254,7 +254,7 @@
         <div class="footer">
           <el-button type="success" @click="toCheckOrder">联查单据</el-button>
           <el-button type="danger" @click="closeData" v-if="!isDealer && (detailData.examineStatus === 'SAVE' || detailData.examineStatus === 'WAIT')">关闭订单</el-button>
-          <el-button type="primary" @click="openDirectDialog" v-if="!isDealer">提前开票</el-button>
+          <!-- <el-button type="primary" @click="openDirectDialog" v-if="!isDealer">提前开票</el-button> -->
           <el-button type="primary" @click="overData" v-if="!isDealer">直调完结</el-button>
           <el-button type="primary" @click="openDeliverDialog" :disabled="detailData.directTransferStatus" v-if="!isDealer">直调发货</el-button>
           <el-button @click="goBack">返回列表</el-button>

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/policy/components/retail_detail.vue

@@ -325,7 +325,7 @@
     <div class="page-footer">
       <div class="footer" :class="classObj">
         <el-button type="success" @click="toCheckOrder">联查单据</el-button>
-        <el-button v-if="isCustomer" type="primary" :disabled="detailData.examineStatus !== 'OK'" @click="openDirectDialog">提前开票</el-button>
+        <!-- <el-button v-if="isCustomer" type="primary" :disabled="detailData.examineStatus !== 'OK'" @click="openDirectDialog">提前开票</el-button> -->
 
         <el-button
           v-if="isCustomer"

src/views/supply/retail/components/retail_detail.vue

@@ -156,7 +156,7 @@
       <div class="page-footer">
         <div class="footer">
           <el-button type="success" @click="toCheckOrder">联查单据</el-button>
-          <el-button type="primary" @click="openDirectDialog" :disabled="detailData.examineStatus !== 'OK'" v-if="!isDealer">提前开票</el-button>
+          <!-- <el-button type="primary" @click="openDirectDialog" :disabled="detailData.examineStatus !== 'OK'" v-if="!isDealer">提前开票</el-button> -->
           <el-button type="primary" @click="openDeliverDialog" :disabled="detailData.examineStatus !== 'OK' || detailData.directTransferStatus === true" v-if="!isDealer">直调发货</el-button>
           <el-button type="primary" @click="handleFinish" :disabled="detailData.examineStatus !== 'OK'" v-if="!isDealer">直调完成</el-button>
           <el-button @click="goBack">返回列表</el-button>

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