pelf: 新增验收验退单

pages/mobile/center/vendor/accept_returns_details.vue

@@ -8,7 +8,7 @@
       <div class="orderbtob_details_top">
         <div class="item clearfix">
           <span class="name fl">买家：</span>
-          <span class="fl" style="width: 5.2rem">{{active === 'accept' ? listInfo.enterprise.enName : '客户采购验退明细'}}</span>
+          <span class="fl" style="width: 5.2rem">{{listInfo.enterprise.enName || listInfo.custEnterprise.enName || '-'}}</span>
         </div>
         <div class="item clearfix">
           <span class="name fl">验收单号：</span>
@@ -18,9 +18,9 @@
           <span class="name fl">送货单号：</span>
           <span class="fl" style="width: 5.2rem">{{listInfo.sendCode || '-'}}</span>
         </div>
-        <div class="item" v-if="!isUser">
+        <div class="item">
           <span class="name">总金额：</span>
-          {{listInfo.currency}}&nbsp;{{listInfo.totalPrice}}
+          {{listInfo.currency}}&nbsp;{{listInfo.totalPrice | computeNum(2)}}
         </div>
         <div class="item">
           <span class="name">付款方式：</span>
@@ -35,43 +35,44 @@
         <div class="list" v-for="item in listInfo.keyItems">
           <div class="item clearfix">
             <span class="name fl">物料编号：</span>
-            <span class="fl" style="width: 5.2rem">{item.product.code || '-'}}</span>
+            <span class="fl">{{item.product.code || '-'}}</span>
           </div>
+          <hr>
           <div class="item clearfix">
             <span class="name fl">品牌：</span>
-            <span class="fl" style="width: 5.2rem">{{item.product.brand || '-'}}</span>
+            <span class="fl" style="width: 5rem">{{item.product.brand || '-'}}</span>
           </div>
           <div class="item clearfix">
             <span class="name fl">物料名称：</span>
-            <span class="fl" style="width: 5.2rem">{{item.product.title || '-'}}</span>
+            <span class="fl" style="width: 5rem">{{item.product.title || '-'}}</span>
           </div>
           <div class="item clearfix">
             <span class="name fl">信号规格：</span>
-            <span class="fl" style="width: 5.2rem">{{item.product.spec || '-'}}</span>
+            <span class="fl" style="width: 5rem">{{item.product.spec || '-'}}</span>
           </div>
           <div class="item clearfix">
             <span class="name fl">订单：</span>
-            <span class="fl" style="width: 5.2rem">{{item.orderItem.order.code || '-'}}</span>
+            <span class="fl">{{item.orderItem.order.code || '-'}}</span>
           </div>
           <div class="item clearfix">
             <span class="name fl">批号：</span>
-            <span class="fl" style="width: 5.2rem">{{item.batchCode || '-'}}</span>
+            <span class="fl">{{item.batchCode || '-'}}</span>
           </div>
           <div class="item clearfix">
             <span class="name fl">单位：</span>
-            <span class="fl" style="width: 5.2rem">{{item.product.unit || '-'}}</span>
+            <span class="fl">{{item.product.unit || '-'}}</span>
           </div>
           <div class="item clearfix">
             <span class="name fl">数量：</span>
-            <span class="fl" style="width: 5.2rem">{{item.qty || '-'}}</span>
+            <span class="fl">{{item.qty || '-'}}</span>
           </div>
-          <div class="item clearfix"  v-if="!isUser">
+          <div class="item clearfix">
             <span class="name fl">单价：</span>
-            <span class="fl" style="width: 5.2rem">{{item.orderPrice | computeNum(2) || '-'}}</span>
+            <span class="fl">{{item.orderPrice | computeNum(2) || '-'}}</span>
           </div>
           <div class="clearfix" style="border-top:1px solid #D9D9D9;padding: 0 0.15rem;line-height: 0.8rem" >
             <div class="fl" style="font-size: 0.26rem">小计：</div>
-            <div class="fr" style="color: #FF3208;font-size: 0.26rem">{{(item.price * item.qty) | computeNum(2)}}</div>
+            <div class="fr" style="color: #FF3208;font-size: 0.26rem">{{item.itemTotalPrice | computeNum(2)}}</div>
           </div>
         </div>
       </div>
@@ -92,6 +93,8 @@
         detailsId: this.$route.query.id,
         isUser: '',
         listInfo: {
+          enterprise: {},
+          custEnterprise: {},
           keyItems: []
         },
         collectResult: '',
@@ -99,8 +102,10 @@
       }
     },
     created() {
-      this.getInitInfo()
-      this._getToken()
+      this.$nextTick(() => {
+        this.getInitInfo()
+        this._getToken()
+      })
     },
     methods: {
       _iniFo(str) {
@@ -116,10 +121,14 @@
             if (data.orderPrice == null) {
               data.orderPrice = 0
             }
+            data.itemTotalPrice = data.orderPrice * data.qty
             sum += data.orderPrice * data.qty
           })
           this.listInfo.totalPrice = sum
           this.listInfo.keyItems = this.baseUtils.deepCopy(this.listInfo[key])
+          this.listInfo.enterprise = this.listInfo.enterprise ? this.baseUtils.deepCopy(this.listInfo.enterprise) : {}
+          this.listInfo.custEnterprise = this.listInfo.custEnterprise ? this.baseUtils.deepCopy(this.listInfo.custEnterprise) : {}
+          console.log(this.listInfo)
         })
       },
       _getToken() {
@@ -228,7 +237,6 @@
           }
           .name {
             color: #666;
-            width: 1.6rem;
             display: inline-block;
           }
           .dateinput {
@@ -243,66 +251,6 @@
             margin-right: 0.05rem;
           }
         }
-        .replayBtn {
-          width: 6.59rem;
-          height: 0.77rem;
-          background-color: #3f84f6;
-          border-radius: 0.08rem;
-          font-size: 0.28rem;
-          line-height: 0.77rem;
-          color: #ffffff;
-          overflow: hidden;
-          text-align: center;
-          margin-top: 0.2rem
-        }
-        .table {
-          width: 4.52rem;
-          background-color: #f3f3f3;
-          color: #333333;
-          font-size: 0.28rem;
-          .li_title {
-            border: 1px solid #c5c5c5;
-            div {
-              width: 1.87rem;
-              text-align: center;
-              border-right: 1px solid #c5c5c5;
-              &:last-child {
-                border-right: 0
-              }
-            }
-            .fisrt {
-              width: 0.74rem;
-            }
-          }
-          .li_content {
-            border: 1px solid #c5c5c5;
-            background: #fff;
-            border-top: 0px;
-            div {
-              width: 1.87rem;
-              text-align: center;
-              border-right: 1px solid #c5c5c5;
-              &:last-child {
-                border-right: 0
-              }
-              input {
-                text-align: center;
-                width: 100%;
-                height: 0.49rem;
-                border: 0;
-              }
-            }
-            .fisrt {
-              width: 0.74rem;
-            }
-          }
-        }
-      }
-      .bottom {
-        font-size: 0.2rem;
-        color: #999;
-        border-top: 1px solid #aeaeae;
-        padding-top: 0.1rem;
       }
       .noborder{
         border: 0

pages/mobile/center/vendor/returns/index.vue

@@ -107,7 +107,7 @@
     },
     methods: {
       lookItem(bill) {
-        this.$router.push('/mobile/center/vendor/accept_returns_details?type=returns' + '&id=' + bill.id)
+        this.$router.push('/mobile/center/vendor/accept_returns_details?type=return' + '&id=' + bill.id)
       },
       setSelect (type, val, isReload) {
         if (type === 'date') {