暂存

src/SDrpManagement/shopCart/modules/confirmOrder.vue

@@ -1,11 +1,17 @@
 <template>
   <div>
     <el-drawer
-    title="确认订单"
     :visible.sync="drawer"
     direction="rtl"
     append-to-body
     size="50%">
+    <div slot="title">
+      <div class="flex-align-center">
+        <p><span style="font-size:14px">订单合计:</span><span style="color:red;font-size:16px;"><b>¥&nbsp;{{tool.formatAmount(total,2)}}</b></span></p>
+        <label style="font-size:14px;margin-left:10px" for="">备注:</label>
+        <input class="order__note__input" v-model="defaultData.remarks" type="text" placeholder="请输入订单备注">
+      </div>
+    </div>
     <div class="drawer__panel">
       <div class="flex-align-center normal-margin">
         <div style="flex:1;margin-right:10px">
@@ -47,11 +53,10 @@
               </el-table>
               <el-button slot="reference" type="text" size="mini">选择其他地址</el-button>
             </el-popover>
-
           </div>
           <div class="reveive__panel normal-margin">
             <p><span class="inline-16"><b>{{defaultData.re_info.name}}</b></span><small>{{defaultData.re_info.phonenumber}}</small></p>
-            <small>{{defaultData.re_info.province}}{{defaultData.re_info.city}}{{defaultData.re_info.county}}{{defaultData.re_info.address}}</small>
+            <small>{{defaultData.re_info.province}}{{defaultData.re_info.city}}{{defaultData.re_info.county}}{{defaultData.re_info.address?defaultData.re_info.address:'--'}}</small>
           </div>
         </div>
         <div style="flex:1">
@@ -183,7 +188,8 @@
             width="180">
           </el-table-column>
           <el-table-column
-            label="型号/规格">
+            label="型号/规格"
+            width="180">
             <template slot-scope="scope">
               <p><span>{{scope.row.model}}</span>&nbsp;/&nbsp;<span>{{scope.row.spec}}</span></p>
             </template>
@@ -238,7 +244,7 @@
 import previewImage from '@/components/previewImage/index.vue'
 
 export default {
-  props:['data'],
+  props:['data','total'],
   components:{
     previewImage
   },
@@ -330,7 +336,18 @@ export default {
       this.financiallist = res.data
       this.defaultData.fin_info = res.data[0]
     },
-    
+    async submit() {
+      const res = await this.$api.requested({
+        "content": {
+          "sa_accountclassid": this.accountlist[this.defaultData.account_index].sa_accountclassid, //营销账户类型ID
+          "sys_enterprise_financeid": this.defaultData.fin_info.sys_enterprise_financeid, //合作企业财务信息ID（开票信息）
+          "sa_logiscompid": this.defaultData.logist_info.sa_logiscompid, //物流公司档案ID
+          "rec_contactsid": this.defaultData.re_info.contactsid, //合作企业联系人表ID（收货信息）
+          "remarks": this.defaultData.remarks, //可选
+          "items": []
+        },
+      })
+    }
   },
   mounted () {
     // this.receiveAddress()
@@ -365,4 +382,11 @@ export default {
 .image {
   width:40px;height:40px;margin:0px auto;
 }
+.order__note__input{
+  border: none;
+  outline: none;
+  /* margin-left: 10px; */
+  /* border-bottom: 1px solid #f1f2f3; */
+  flex:1
+}
 </style>

src/SDrpManagement/shopCart/modules/total.vue

@@ -1,6 +1,6 @@
 <template>
 <div>
-  <confirmOrder :data="data" ref="conf"></confirmOrder>
+  <confirmOrder :data="data" :total="total" ref="conf"></confirmOrder>
   <div class="total-panel normal-panel flex-align-center flex-between">
     <p class="text-grey" @click="deleSelectProd">删除选中商品</p>
     <div class="flex-align-center">
@@ -52,18 +52,6 @@ export default {
       })
       this.$refs['conf'].drawer = true
     },
-    async submit() {
-      const res = await this.$api.requested({
-        "content": {
-          "sa_accountclassid": 1, //营销账户类型ID
-          "sys_enterprise_financeid": 1, //合作企业财务信息ID（开票信息）
-          "sa_logiscompid": 1, //物流公司档案ID
-          "rec_contactsid": 1, //合作企业联系人表ID（收货信息）
-          "remarks": "备注说明", //可选
-          "items": []
-        },
-      })
-    }
   }
 }