Merge branch 'feature/Feature-copy' into develop

src/layout/components/Navbar.vue

@@ -16,12 +16,12 @@
           ></i>
         </el-tooltip>
       </div> -->
-      <!-- <div class="right-menu-item hover-effect" @click="handleNotice"  style="display: flex;">
+      <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>
       <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>
@@ -68,7 +68,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="到货通知" :modal="false" :visible.sync="isNotice" center @close="handleNotice">
+    <el-dialog title="到货通知" :modal="false" :visible.sync="hasNotice" center @close="handleNotice">
       <el-table :data="[]">
         <el-table-column property="date" label="产品编号" ></el-table-column>
         <el-table-column property="name" label="物料编码" ></el-table-column>
@@ -220,14 +220,23 @@ export default {
     noticeVisible() {
       return this.noticeCount > 0;
     },
+    hasNotice:{
+      get(){
+        return  this.isNotice
+      },
+      set(e){
+        return e
+      }
+    },
     ...mapGetters(["sidebar", "avatar", "device", "name","isNotice"]),
+
   },
   methods: {
     getList(){
     }
     ,
     handleNotice(){
-      this.$store.commit("user/SET_STATUS",!this.isNotice);
+      this.$store.commit("user/SET_STATUS",!this.hasNotice);
     },
     toggleSideBar() {
       this.$store.dispatch("app/toggleSideBar");

src/store/modules/user.js

@@ -62,7 +62,8 @@ const mutations = {
       state.showMessages = true;
     } else {
       state.showMessages = false;
-      state.isNotice = false
+      state.isNotice = true
+
     }
   },
 };

src/views/supply/direct/direct_list.vue

@@ -152,15 +152,15 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copyText='scope.row.orderType === "TRADE" ||
+                <CopyButton :copyText='(scope.row.orderType === "TRADE" ||
                 scope.row.orderType === "HOME" || scope.row.orderType
                 ==="REQUISITION_TRADE" || scope.row.orderType
-                ==="REQUISITION_HOME"? scope.row.enginOrderNo:scope.row.mainOrderId' />
+                ==="REQUISITION_HOME")? scope.row.enginOrderNo:scope.row.mainOrderId' />
                 <span>{{
-                  scope.row.orderType === "TRADE" ||
+                 ( scope.row.orderType === "TRADE" ||
                   scope.row.orderType === "HOME" ||
                   scope.row.orderType === "REQUISITION_TRADE" ||
-                  scope.row.orderType === "REQUISITION_HOME"
+                  scope.row.orderType === "REQUISITION_HOME")
                     ? scope.row.enginOrderNo
                     : scope.row.mainOrderId
                 }}</span>

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

@@ -274,7 +274,6 @@
         </el-table-column>
         <el-table-column align="center" label="税率" prop="tax" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="仓库" prop="correspondName" min-width="100" show-overflow-tooltip>
-
         </el-table-column>
         <el-table-column align="center" label="仓库状态" prop="status2" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -521,6 +520,7 @@ export default {
           }else {
             // this.mainForm.salesMan = this.goodsList[0].serviceId;
           }
+          return newValue
         }else {
           this.flag = false
           this.mainForm.salesMan = '';
@@ -561,12 +561,10 @@ export default {
     setStock(id){
       if (this.goodsList.length) {
         const item = this.warehouseList.find(e=>e.id === id)
-        console.log(item);
           this.goodsList.forEach(k=>{
-            k.correspondName = item.name
+
             this.$set(k,'correspondName',item.name)
             this.$set(k,'correspondId',item.id)
-
           })
       }
 

src/views/supply/engin/engin_list.vue

@@ -13,8 +13,8 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="工程信息单号" prop="orderNum">
-                <el-input v-model="screenForm.orderNum" placeholder="请输入工程信息单号"></el-input>
+              <el-form-item label="工程登录编号" prop="orderNum">
+                <el-input v-model="screenForm.orderNum" placeholder="请输入工程登录编号"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -22,11 +22,11 @@
                 <el-input v-model="screenForm.enginNum" placeholder="请输入工程编码"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
+            <!-- <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="工程登录编号" prop="loginNum">
                 <el-input v-model="screenForm.loginNum" placeholder="请输入工程登录编号"></el-input>
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="项目名称" prop="enginName">
                 <el-input v-model="screenForm.enginName" placeholder="请输入项目名称"></el-input>
@@ -130,7 +130,7 @@
                 {{scope.row.examineStatus | statusFilter}}
               </template>
             </el-table-column>
-            <el-table-column align="left" label="工程信息单号" sortable prop="enginInfoNo" min-width="150" show-overflow-tooltip>
+            <el-table-column align="left" label="工程登录编号" sortable prop="enginInfoNo" min-width="150" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.enginInfoNo" />
                 <span>{{scope.row.enginInfoNo}}</span>

src/views/supply/implement/nsales_list.vue

@@ -281,15 +281,15 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copyText='scope.row.orderType === "TRADE" ||
+                <CopyButton :copyText='(scope.row.orderType === "TRADE" ||
                 scope.row.orderType === "HOME" || scope.row.orderType
                 ==="REQUISITION_TRADE" || scope.row.orderType
-                ==="REQUISITION_HOME"? scope.row.enginOrderNo:scope.row.mainOrderId' />
+                ==="REQUISITION_HOME")? scope.row.enginOrderNo:scope.row.mainOrderId' />
                 <span>{{
-                  scope.row.orderType === "TRADE" ||
+                  (scope.row.orderType === "TRADE" ||
                   scope.row.orderType === "HOME" ||
                   scope.row.orderType === "REQUISITION_TRADE" ||
-                  scope.row.orderType === "REQUISITION_HOME"
+                  scope.row.orderType === "REQUISITION_HOME")
                     ? scope.row.enginOrderNo
                     : scope.row.mainOrderId
                 }}</span>

src/views/supply/pickup/check.vue

@@ -316,19 +316,19 @@
               <template slot-scope="scope">
                 <CopyButton
                   :copyText="
-                    scope.row.orderType === 'TRADE' ||
+                    (scope.row.orderType === 'TRADE' ||
                     scope.row.orderType === 'HOME' ||
                     scope.row.orderType === 'REQUISITION_TRADE' ||
-                    scope.row.orderType === 'REQUISITION_HOME'
+                    scope.row.orderType === 'REQUISITION_HOME')
                       ? scope.row.enginOrderNo
                       : scope.row.mainOrderId
                   "
                 />
                 <span>{{
-                  scope.row.orderType === "TRADE" ||
+                  (scope.row.orderType === "TRADE" ||
                   scope.row.orderType === "HOME" ||
                   scope.row.orderType === "REQUISITION_TRADE" ||
-                  scope.row.orderType === "REQUISITION_HOME"
+                  scope.row.orderType === "REQUISITION_HOME")
                     ? scope.row.enginOrderNo
                     : scope.row.mainOrderId
                 }}</span>

src/views/supply/pickup/pickup_list.vue

@@ -206,15 +206,15 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copyText='scope.row.orderType === "TRADE" ||
+                <CopyButton :copyText='(scope.row.orderType === "TRADE" ||
                 scope.row.orderType === "HOME" || scope.row.orderType
                 ==="REQUISITION_TRADE" || scope.row.orderType
-                ==="REQUISITION_HOME"? scope.row.enginOrderNo:scope.row.mainOrderId' />
+                ==="REQUISITION_HOME")? scope.row.enginOrderNo:scope.row.mainOrderId' />
                 <span>{{
-                  scope.row.orderType === "TRADE" ||
+                  (scope.row.orderType === "TRADE" ||
                   scope.row.orderType === "HOME" ||
                   scope.row.orderType === "REQUISITION_TRADE" ||
-                  scope.row.orderType === "REQUISITION_HOME"
+                  scope.row.orderType === "REQUISITION_HOME")
                     ? scope.row.enginOrderNo
                     : scope.row.mainOrderId
                 }}</span>

src/views/supply/sales/components/sales_detail.vue

@@ -71,10 +71,10 @@
           >
             <template slot-scope="scope">
               {{
-                scope.row.orderType === "TRADE" ||
+                (scope.row.orderType === "TRADE" ||
                   scope.row.orderType === "HOME" ||
                   scope.row.orderType === "REQUISITION_TRADE" ||
-                  scope.row.orderType === "REQUISITION_HOME"
+                  scope.row.orderType === "REQUISITION_HOME")
                     ? scope.row.enginOrderNo
                     : scope.row.mainOrderId
               }}

src/views/supply/sales/sales_list.vue

@@ -317,14 +317,14 @@
               sortable
             >
               <template slot-scope="scope">
-                <CopyButton :copyText='scope.row.orderType === "TRADE" ||
+                <CopyButton :copyText='(scope.row.orderType === "TRADE" ||
                 scope.row.orderType === "HOME" || scope.row.orderType
                 ==="REQUISITION_TRADE" || scope.row.orderType
-                ==="REQUISITION_HOME"? scope.row.enginOrderNo:scope.row.mainOrderId' />                <span>{{
-                  scope.row.orderType === "TRADE" ||
+                ==="REQUISITION_HOME")? scope.row.enginOrderNo:scope.row.mainOrderId' />                <span>{{
+                  (scope.row.orderType === "TRADE" ||
                   scope.row.orderType === "HOME" ||
                   scope.row.orderType === "REQUISITION_TRADE" ||
-                  scope.row.orderType === "REQUISITION_HOME"
+                  scope.row.orderType === "REQUISITION_HOME")
                     ? scope.row.enginOrderNo
                     : scope.row.mainOrderId
                 }}</span>