ct 2 日 前
コミット
7cb306f458

+ 7 - 5
src/views/crm/customer/assist.vue

@@ -144,11 +144,11 @@
               {{ option.dictLabel }}
             </el-dropdown-item>
           </el-dropdown-menu>
-          <span class="el-dropdown-link" >
+          <!-- <span class="el-dropdown-link" >
               <el-button  type="success"   size="mini" >
                 创建订单
               </el-button>
-            </span>
+            </span> -->
         </el-dropdown>
 
 <!--        <el-button-->
@@ -183,7 +183,7 @@
           {{scope.row.mobile}}
           <el-button type="text"    size="mini" @click="callNumber(scope.row.customerId,null)">拨号</el-button>
           <el-button v-hasPermi="['crm:customer:addVisit']"  type="text" size="mini" @click="handleAddVisit(scope.row)">写跟进</el-button>
-          <el-button type="text"    size="mini" @click="addPackageOrder()" style="margin-right: 15px;">创建订单</el-button>
+          <el-button type="text"    size="mini" @click="addPackageOrder(scope.row)" style="margin-right: 15px;">创建订单</el-button>
         </template>
       </el-table-column>
       <el-table-column  label="客户来源" align="center" prop="source">
@@ -292,7 +292,7 @@
         <add-visit-status ref="visitStatus" @close="closeVisitStatus()"></add-visit-status>
     </el-dialog>
     <el-dialog title="创建线上订单" :visible.sync="addPackageOpen" width="1000px" append-to-body>
-      <addPackage  @closePackage="closePackage"   ref="addPackageVisit" />
+      <addPackage  @closePackage="closePackage"   ref="addPackageVisit"  :customerId="customerId"/>
     </el-dialog>
     <el-dialog title="创建线下订单" :visible.sync="addOfflineOrder.open" width="1000px" append-to-body>
       <add-order-offline @closeOrderOffline="closeOrderOffline"   ref="addOrderOffline" />
@@ -322,6 +322,7 @@ export default {
   components: {addPackage,addOrderOffline,addVisitStatus,addCustomerType,addRemark,addTag,assignUser,assistUser,addOrEditCustomer,editSource, addBatchSms,customerDetails,addVisit },
   data() {
     return {
+      customerId:null,
       addOfflineOrder:{
         open:false,
       },
@@ -499,7 +500,8 @@ export default {
     closeOrderOffline(){
       this.addOfflineOrder.open = false
     },
-    addPackageOrder(){
+    addPackageOrder(row){
+        this.customerId = row.customerId;
        this.addPackageOpen=true;
     },
     closePackage(){

+ 5 - 3
src/views/crm/customer/my.vue

@@ -228,7 +228,7 @@
           {{scope.row.mobile}}
           <el-button type="text"    size="mini" @click="callNumber(scope.row.customerId,null,null,selectedCallerLine)">拨号</el-button>
           <el-button v-hasPermi="['crm:customer:addVisit']"  type="text" size="mini" @click="handleAddVisit(scope.row)">写跟进</el-button>
-          <el-button type="text"    size="mini" @click="addPackageOrder()" style="margin-right: 15px;">创建订单</el-button>
+          <el-button type="text"    size="mini" @click="addPackageOrder(scope.row)" style="margin-right: 15px;">创建订单</el-button>
         </template>
       </el-table-column>
       <el-table-column  label="客户来源" align="center" prop="source">
@@ -344,7 +344,7 @@
         <add-visit-status ref="visitStatus" @close="closeVisitStatus()"></add-visit-status>
     </el-dialog>
     <el-dialog title="创建线上订单" :visible.sync="addPackageOpen" width="1000px" append-to-body>
-      <addPackage  @closePackage="closePackage"   ref="addPackageVisit" />
+      <addPackage  @closePackage="closePackage"   ref="addPackageVisit" :customerId="customerId"/>
     </el-dialog>
     <el-dialog title="创建线下订单" :visible.sync="addOfflineOrder.open" width="1000px" append-to-body>
       <add-order-offline @closeOrderOffline="closeOrderOffline"   ref="addOrderOffline" />
@@ -375,6 +375,7 @@ export default {
   components: {addPackage,addOrderOffline,addVisitStatus,addCustomerType,addRemark,addTag,assignUser,assistUser,addOrEditCustomer,editSource, addBatchSms,customerDetails,addVisit },
   data() {
     return {
+      customerId:null,
       selectedCallerLine:null,
       callerApis:[], //我的线路
       addOfflineOrder:{
@@ -573,7 +574,8 @@ export default {
     closeOrderOffline(){
       this.addOfflineOrder.open = false
     },
-    addPackageOrder(){
+    addPackageOrder(row){
+       this.customerId = row.customerId;
        this.addPackageOpen=true;
     },
     closePackage(){

+ 6 - 0
src/views/store/components/addOrder.vue

@@ -117,6 +117,12 @@
                     />
               </el-select>
             </el-form-item>
+            <el-form-item label="改价" prop="payPrice">
+              <el-input-number  v-model="form.payPrice" placeholder="修改商品总价" size="medium" :precision="2" min=0.01 :step="0.1" />
+            </el-form-item>
+            <el-form-item label="物流代收" prop="amount" v-if="form.payType == '3'">
+              <el-input-number  v-model="form.amount" placeholder="平台支付价格" size="medium" :precision="2" min=0.01 :step="0.1" />
+            </el-form-item>
             <el-form-item label="订单备注" prop="mark">
               <el-input  type="textarea" rows="2" v-model="form.mark" placeholder="" />
             </el-form-item>

+ 8 - 1
src/views/store/storeOrder/list.vue

@@ -298,7 +298,7 @@
     </el-drawer>
     <el-dialog :title="title" v-if="open" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal ="false">
         <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-           <el-form-item label="会员信息" prop="userId">
+           <el-form-item label="会员信息" >
                 <el-row  >
                   <el-col >
                       <el-input placeholder="请输入会员手机号" style="width:240px;cursor:pointer" v-model="phone">
@@ -412,6 +412,12 @@
                     />
               </el-select>
             </el-form-item>
+            <el-form-item label="改价" prop="payPrice">
+              <el-input-number  v-model="form.payPrice" placeholder="修改商品总价" size="medium" :precision="2" min=0.01 :step="0.1" />
+            </el-form-item>
+            <el-form-item label="物流代收" prop="amount" v-if="form.payType == '3'">
+              <el-input-number  v-model="form.amount" placeholder="平台支付价格" size="medium" :precision="2" min=0.01 :step="0.1" />
+            </el-form-item>
             <el-form-item label="订单备注" prop="mark">
               <el-input  type="textarea" rows="2" v-model="form.mark" placeholder="" />
             </el-form-item>
@@ -708,6 +714,7 @@ export default {
       row.count=1;
       row.money=row.count*row.price;
       this.products.push(row);
+      this.$message.success("商品"+ row.productName + "添加成功")
       this.compute();
     },
     handleAddProduct(){