阿拉蕾 1 year ago
parent
commit
3305e70df6
2 changed files with 35 additions and 13 deletions
  1. 26 0
      src/views/store/components/productOrder.vue
  2. 9 13
      src/views/store/storeOrder/allList.vue

+ 26 - 0
src/views/store/components/productOrder.vue

@@ -121,6 +121,11 @@
                   {{order.remark }}
                 </span>
             </el-descriptions-item>
+            <el-descriptions-item label="跟随阶段"  v-if="company.companyId == 174">
+              <span v-if="order!=null ">
+                <el-tag prop="orderVisit" v-for="(item, index) in customerUserStatusOptions"    v-if="order.orderVisit==item.dictValue">{{item.dictLabel}}</el-tag>
+              </span>
+            </el-descriptions-item>
             <el-descriptions-item v-if="customerInfo!=null " label="客户编码"  >
                 <span >
                   {{customerInfo.customerCode }}
@@ -293,6 +298,16 @@
                     />
             </el-select>
         </el-form-item>
+        <el-form-item label="跟随阶段" prop="orderVisit" v-if="company.companyId == 174" >
+          <el-select filterable style="width: 200px" v-model="editForm.orderVisit" placeholder="请选择跟随阶段" clearable size="small" >
+            <el-option
+                v-for="item in customerUserStatusOptions"
+                :key="item.dictValue"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+              />
+          </el-select>
+        </el-form-item>
         <el-form-item label="备注" prop="mark"  >
           <el-input v-model="editForm.mark" placeholder="请输入备注" />
         </el-form-item>
@@ -472,6 +487,7 @@ export default {
     ImageUpload,Material ,addSms},
   data() {
     return {
+      customerUserStatusOptions:[],
       scheduleOptions:[],
       dialogVisibleImage: false,
       customerInfo:null,
@@ -551,6 +567,7 @@ export default {
       editForm:{
         orderType:null,
         scheduleId:null,
+        orderVisit:null,
         mark:"",
       },
       editRules:{
@@ -571,6 +588,9 @@ export default {
     };
   },
   created() {
+    this.getDicts("crm_customer_user_status").then((response) => {
+            this.customerUserStatusOptions = response.data;
+        });
     this.getDicts("store_order_type").then((response) => {
       this.orderTypeOptions = response.data;
     });
@@ -587,6 +607,11 @@ export default {
       this.scheduleOptions = response.data;
     });
   },
+  computed: {
+    company(){
+      return this.$store.state.user.user;
+    }
+  },
   methods: {
     closeSms(){
       this.addSms.open=false;
@@ -806,6 +831,7 @@ export default {
           this.editForm.orderType=this.order.orderType.toString();
         }
         this.editForm.scheduleId=this.order.scheduleId;
+        this.editForm.orderVisit = this.order.orderVisit;
 
     },
     getOrder(orderId){

+ 9 - 13
src/views/store/storeOrder/allList.vue

@@ -187,19 +187,11 @@
                   <span>{{scope.row.realName}} </span>
               </template>
           </el-table-column>
-          <!-- <el-table-column label="商品" align="center" width="300px" >
-              <template slot-scope="scope">
-                  <div  v-for="(item, index) in scope.row.items" class="items"  >
-                    <img class="pic" :src="JSON.parse(item.jsonInfo).image" />
-                    <div class="goods-content">
-                      <div class="goods-title">{{ JSON.parse(item.jsonInfo).productName}}</div>
-                      <div class="sku">{{ JSON.parse(item.jsonInfo).sku}}</div>
-                      <div class="price">¥{{JSON.parse(item.jsonInfo).price}}×{{item.num}}</div>
-                    </div>
-                    
-                  </div>
-              </template>
-          </el-table-column> -->
+          <el-table-column label="跟随阶段" align="center" prop="orderVisit" >
+            <template slot-scope="scope">
+                <el-tag prop="orderVisit" v-for="(item, index) in customerUserStatusOptions"    v-if="scope.row.orderVisit==item.dictValue">{{item.dictLabel}}</el-tag>
+            </template>
+          </el-table-column>
           <el-table-column label="订单金额" align="center" prop="totalPrice" >
               <template slot-scope="scope">
                   <span v-if="scope.row.totalPrice!=null">{{scope.row.totalPrice.toFixed(2)}}</span>
@@ -293,6 +285,7 @@ export default {
   name: "StoreOrder",
   data() {
     return {
+      customerUserStatusOptions:[],
       // 部门树选项
       deptOptions: undefined,
       // 是否显示弹出层
@@ -441,6 +434,9 @@ export default {
   },
   created() {
     this.getTreeselect();
+    this.getDicts("crm_customer_user_status").then((response) => {
+        this.customerUserStatusOptions = response.data;
+    });
     this.getDicts("store_order_type").then((response) => {
       this.orderTypeOptions = response.data;
     });