Merge branch 'dev' of http://172.16.90.250:3000/forest/forest-web into dev

src/api/intention.js

@@ -0,0 +1,8 @@
+import request from '@/utils/request'
+export function fetchList(params) {
+  return request({
+    url:'/oms/pre/web/list',
+    method:'get',
+    params:params
+  })
+}

src/api/order.js

@@ -61,3 +61,10 @@ export function updateOrderNote(params) {
     params:params
   })
 }
+
+export function logisticsCompany() {
+  return request({
+    url:'/express/select',
+    method:'get'
+  })
+}

src/router/index.js

@@ -136,6 +136,12 @@ export const asyncRouterMap = [
         component: () => import('@/views/pms/brand/index'),
         meta: {title: '品牌管理', icon: 'product-brand'}
       },
+      {
+        path: 'intention',
+        name: 'intention',
+        component: () => import('@/views/pms/intention/index'),
+        meta: {title: '意向管理', icon: 'product-brand'}
+      },
       {
         path: 'addBrand',
         name: 'addBrand',

src/views/oms/order/components/logisticsDialog.vue

@@ -16,13 +16,13 @@
 </template>
 <script>
   const defaultLogisticsList=[
-    {name: '订单已提交，等待付款',time:'2017-04-01 12:00:00 '},
-    {name: '订单付款成功',time:'2017-04-01 12:00:00 '},
-    {name: '在北京市进行下级地点扫描，等待付款',time:'2017-04-01 12:00:00 '},
-    {name: '在分拨中心广东深圳公司进行卸车扫描，等待付款',time:'2017-04-01 12:00:00 '},
-    {name: '在广东深圳公司进行发出扫描',time:'2017-04-01 12:00:00 '},
-    {name: '到达目的地网点广东深圳公司，快件将很快进行派送',time:'2017-04-01 12:00:00 '},
-    {name: '订单已签收，期待再次为您服务',time:'2017-04-01 12:00:00 '}
+    {name: '暂时无法查看,请手动查询',time:''},
+    // {name: '订单付款成功',time:'2017-04-01 12:00:00 '},
+    // {name: '在北京市进行下级地点扫描，等待付款',time:'2017-04-01 12:00:00 '},
+    // {name: '在分拨中心广东深圳公司进行卸车扫描，等待付款',time:'2017-04-01 12:00:00 '},
+    // {name: '在广东深圳公司进行发出扫描',time:'2017-04-01 12:00:00 '},
+    // {name: '到达目的地网点广东深圳公司，快件将很快进行派送',time:'2017-04-01 12:00:00 '},
+    // {name: '订单已签收，期待再次为您服务',time:'2017-04-01 12:00:00 '}
   ];
   export default {
     name:'logisticsDialog',

src/views/oms/order/deliverOrderList.vue

@@ -29,9 +29,9 @@
                        v-model="scope.row.deliveryCompany"
                        size="small">
               <el-option v-for="item in companyOptions"
-                         :key="item"
-                         :label="item"
-                         :value="item">
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
               </el-option>
             </el-select>
           </template>
@@ -50,7 +50,7 @@
   </div>
 </template>
 <script>
-  import {deliveryOrder} from '@/api/order'
+  import {deliveryOrder,logisticsCompany} from '@/api/order'
   const defaultLogisticsCompanies=["顺丰快递","圆通快递","中通快递","韵达快递"];
   export default {
     name: 'deliverOrderList',
@@ -62,6 +62,8 @@
     },
     created(){
       this.list= this.$route.query.list;
+      this.getLogisticsCompany();
+
     },
     methods:{
       cancel(){
@@ -86,7 +88,15 @@
             message: '已取消发货'
           });
         });
+      },
+      //获取物流公司
+      getLogisticsCompany(){
+        logisticsCompany().then(response =>{
+          this.companyOptions = response.data;
+        })
+
       }
+
     }
   }
 </script>

src/views/oms/order/index.vue

@@ -114,15 +114,15 @@
               size="mini"
               @click="handleDeliveryOrder(scope.$index, scope.row)"
               v-show="scope.row.status===1">订单发货</el-button>
-            <el-button
+            <!-- <el-button
               size="mini"
               @click="handleViewLogistics(scope.$index, scope.row)"
-              v-show="scope.row.status===2||scope.row.status===3">订单跟踪</el-button>
-            <el-button
+              v-show="scope.row.status===2||scope.row.status===3">订单跟踪</el-button> -->
+            <!-- <el-button
               size="mini"
               type="danger"
               @click="handleDeleteOrder(scope.$index, scope.row)"
-              v-show="scope.row.status===4">删除订单</el-button>
+              v-show="scope.row.status===4">删除订单</el-button> -->
           </template>
         </el-table-column>
       </el-table>

src/views/oms/order/orderDetail.vue

@@ -6,7 +6,7 @@
         <el-step title="支付订单" :description="formatTime(order.paymentTime)"></el-step>
         <el-step title="平台发货" :description="formatTime(order.deliveryTime)"></el-step>
         <el-step title="确认收货" :description="formatTime(order.receiveTime)"></el-step>
-        <el-step title="完成评价" :description="formatTime(order.commentTime)"></el-step>
+        <!-- <el-step title="完成评价" :description="formatTime(order.commentTime)"></el-step> -->
       </el-steps>
     </div>
     <el-card shadow="never" style="margin-top: 15px">
@@ -17,23 +17,23 @@
           <el-button size="mini" @click="showUpdateReceiverDialog">修改收货人信息</el-button>
           <el-button size="mini">修改商品信息</el-button>
           <el-button size="mini" @click="showUpdateMoneyDialog">修改费用信息</el-button>
-          <el-button size="mini" @click="showMessageDialog">发送站内信</el-button>
+          <!-- <el-button size="mini" @click="showMessageDialog">发送站内信</el-button> -->
           <el-button size="mini" @click="showCloseOrderDialog">关闭订单</el-button>
           <el-button size="mini" @click="showMarkOrderDialog">备注订单</el-button>
         </div>
         <div class="operate-button-container" v-show="order.status===1">
           <el-button size="mini" @click="showUpdateReceiverDialog">修改收货人信息</el-button>
-          <el-button size="mini" @click="showMessageDialog">发送站内信</el-button>
+          <!-- <el-button size="mini" @click="showMessageDialog">发送站内信</el-button> -->
           <el-button size="mini">取消订单</el-button>
           <el-button size="mini" @click="showMarkOrderDialog">备注订单</el-button>
         </div>
         <div class="operate-button-container" v-show="order.status===2||order.status===3">
-          <el-button size="mini" @click="showLogisticsDialog">订单跟踪</el-button>
-          <el-button size="mini" @click="showMessageDialog">发送站内信</el-button>
+          <!-- <el-button size="mini" @click="showLogisticsDialog">订单跟踪</el-button> -->
+          <!-- <el-button size="mini" @click="showMessageDialog">发送站内信</el-button> -->
           <el-button size="mini" @click="showMarkOrderDialog">备注订单</el-button>
         </div>
         <div class="operate-button-container" v-show="order.status===4">
-          <el-button size="mini" @click="handleDeleteOrder">删除订单</el-button>
+          <!-- <el-button size="mini" @click="handleDeleteOrder">删除订单</el-button> -->
           <el-button size="mini" @click="showMarkOrderDialog">备注订单</el-button>
         </div>
       </div>

src/views/oms/order/setting.vue

@@ -4,36 +4,36 @@
              ref="orderSettingForm"
              :rules="rules"
              label-width="150px">
-      <el-form-item label="秒杀订单超过：" prop="flashOrderOvertime">
+      <!-- <el-form-item label="秒杀订单超过：" prop="flashOrderOvertime">
         <el-input v-model="orderSetting.flashOrderOvertime" class="input-width">
           <template slot="append">分</template>
         </el-input>
         <span class="note-margin">未付款，订单自动关闭</span>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="正常订单超过：" prop="normalOrderOvertime">
         <el-input v-model="orderSetting.normalOrderOvertime" class="input-width">
           <template slot="append">分</template>
         </el-input>
         <span class="note-margin">未付款，订单自动关闭</span>
       </el-form-item>
-      <el-form-item label="发货超过：" prop="confirmOvertime">
+      <!-- <el-form-item label="发货超过：" prop="confirmOvertime">
         <el-input v-model="orderSetting.confirmOvertime" class="input-width">
           <template slot="append">天</template>
         </el-input>
         <span class="note-margin">未收货，订单自动完成</span>
-      </el-form-item>
-      <el-form-item label="订单完成超过：" prop="finishOvertime">
+      </el-form-item> -->
+      <!-- <el-form-item label="订单完成超过：" prop="finishOvertime">
         <el-input v-model="orderSetting.finishOvertime" class="input-width">
           <template slot="append">天</template>
         </el-input>
         <span class="note-margin">自动结束交易，不能申请售后</span>
-      </el-form-item>
-      <el-form-item label="订单完成超过：" prop="commentOvertime">
+      </el-form-item> -->
+      <!-- <el-form-item label="订单完成超过：" prop="commentOvertime">
         <el-input v-model="orderSetting.commentOvertime" class="input-width">
           <template slot="append">天</template>
         </el-input>
         <span class="note-margin">自动五星好评</span>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button
           @click="confirm('orderSettingForm')"

src/views/pms/brand/components/BrandDetail.vue

@@ -1,6 +1,21 @@
 <template> 
   <el-card class="form-container" shadow="never">
     <el-form :model="brand" :rules="rules" ref="brandFrom" label-width="150px">
+      <el-form-item label="供应商：" prop="compId">
+        <el-select
+          filterable
+          v-model="brand.compId"
+          @change="handleSupplierChange"
+          placeholder="请选择供应商"
+        >
+          <el-option
+            v-for="item in supplierOptList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="品牌名称：" prop="name">
         <el-input v-model="brand.name"></el-input>
       </el-form-item>
@@ -34,22 +49,7 @@
           <el-radio :label="1">是</el-radio>
           <el-radio :label="0">否</el-radio>
         </el-radio-group>
-      </el-form-item>
-      <el-form-item label="供应商：" prop="compId">
-        <el-select
-          filterable
-          v-model="brand.compId"
-          @change="handleSupplierChange"
-          placeholder="请选择供应商"
-        >
-          <el-option
-            v-for="item in supplierOptList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          ></el-option>
-        </el-select>
-      </el-form-item>
+      </el-form-item>      
       <el-form-item>
         <el-button type="primary" @click="onSubmit('brandFrom')">提交</el-button>
         <el-button v-if="!isEdit" @click="resetForm('brandFrom')">重置</el-button>

src/views/pms/brand/index.vue

@@ -23,6 +23,17 @@
             <el-form-item label="输入搜索：">
               <el-input style="width: 203px" v-model="listQuery.keyword" placeholder="品牌名称/关键字"></el-input>
             </el-form-item>
+            <el-form-item label="供应商：">
+            <el-select v-model="listQuery.compId" placeholder="全部" clearable>
+              <el-option
+                v-for="item in compList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+            
           </el-form>
         </div>
     </el-card>
@@ -145,13 +156,15 @@
   </div>
 </template>
 <script>
-  import {fetchList, updateShowStatus, updateFactoryStatus, deleteBrand} from '@/api/brand'
-  import {createbrand,updatebrand,deletebrand} from '@/api/permissions'
+  import {fetchList, updateShowStatus, updateFactoryStatus, deleteBrand} from '@/api/brand';
+  import {selectCompList} from '@/api/product';
+  import {createbrand,updatebrand,deletebrand} from '@/api/permissions';
 
   const defaultListQuery = {
-    pageNo: 1,
+    pageNum: 1,
     pageSize: 10,
-    keyword: null
+    keyword: null,
+    compId:null,
   };
 
   export default {
@@ -161,6 +174,7 @@
         createbrand,
         updatebrand,
         deletebrand,
+        compList:[],
         operates: [
           {
             label: "显示品牌",
@@ -176,13 +190,21 @@
         list: null,
         total: null,
         listLoading: true,
-        multipleSelection: []
+        multipleSelection: []        
       }
     },
     created() {
       this.getList();
+      this.getcompList();
     },
     methods: {
+       /** 获取供应商下拉列表 */
+      getcompList() {
+        selectCompList().then(response => {
+          // console.log("获取供应商下拉列表",response);
+          this.compList = response.data;
+        });
+      },
       getList() {
         this.listLoading = true;
         fetchList(this.listQuery).then(response => {
@@ -198,6 +220,7 @@
       },
       handleResetSearch() {
         this.listQuery = Object.assign({},defaultListQuery);
+        this.getList();
         console.log('this.listQuery',this.listQuery);
       },
       handleUpdate(index, row) {

src/views/pms/intention/index.vue

@@ -0,0 +1,196 @@
+<template> 
+  <div class="app-container">
+    <el-card class="filter-container" shadow="never">
+      <div>
+        <i class="el-icon-search"></i>
+        <span>筛选搜索</span>
+        <el-button
+          style="float:right"
+          type="primary"
+          @click="handleSearchList()"
+          size="small">
+          查询搜索
+        </el-button>
+        <el-button
+          style="float:right;margin-right: 15px"
+          @click="handleResetSearch()"
+          size="small">
+          重置
+        </el-button>
+      </div>
+      <div style="margin-top: 15px">
+        <el-form :inline="true" :model="listQuery" size="small" label-width="140px">
+          <el-form-item label="输入搜索：">
+            <el-input v-model="listQuery.productName" class="input-width" placeholder="产品名称" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="供应商：">
+            <el-select v-model="listQuery.compId" placeholder="全部" clearable>
+              <el-option
+                v-for="item in compList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+      </div>
+    </el-card>
+    <el-card class="operate-container" shadow="never">
+      <i class="el-icon-tickets"></i>
+      <span>数据列表</span>
+    </el-card>
+    <div class="table-container">
+      <el-table ref="roleTable"
+                :data="list"
+                style="width: 100%;"
+                v-loading="listLoading" border>
+
+        <el-table-column label="产品" show-overflow-tooltip align="center">
+          <template slot-scope="scope">{{scope.row.productName}}</template>
+        </el-table-column>
+        <el-table-column label="品牌" show-overflow-tooltip align="center">
+          <template slot-scope="scope">{{scope.row.productBrand}}</template>
+        </el-table-column>
+        <el-table-column label="公司名称" show-overflow-tooltip align="center">
+          <template slot-scope="scope">{{scope.row.compName}}</template>
+        </el-table-column>
+        <el-table-column label="有意向者" show-overflow-tooltip align="center">
+          <template slot-scope="scope">{{scope.row.memberNickname}}</template>
+        </el-table-column>
+        <el-table-column label="有意向时间" show-overflow-tooltip align="center">
+          <template slot-scope="scope">{{scope.row.createDate | formatDateTime}}</template>
+        </el-table-column>        
+        
+        <!-- <el-table-column label="操作" width="160" fixed="right" align="center">
+          <template slot-scope="scope">
+            <el-row>
+            <el-button size="mini" v-if="originupdate"
+                       type="text"
+                       @click="handleUpdateorigin(scope.$index, scope.row)">
+              编辑
+            </el-button>             
+            <el-button size="mini" v-if="intentiondelete"
+                       type="text"
+                       @click="handleDelete(scope.$index, scope.row)">删除
+            </el-button>
+            </el-row>
+          </template>
+        </el-table-column> -->
+      </el-table>
+    </div>
+    <div class="pagination-container">
+      <el-pagination
+        background
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        layout="total, sizes,prev, pager, next,jumper"
+        :current-page.sync="listQuery.pageNo"
+        :page-size="listQuery.pageSize"
+        :page-sizes="[5,10,15]"
+        :total="total">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+<script>
+  import {fetchList} from '@/api/intention';
+  import {formatDate} from '@/utils/date';
+  import {selectCompList} from '@/api/product';
+
+  const defaultListQuery = {
+    pageNo: 1,
+    pageSize: 10,
+    productName: null,
+    compId:null,
+  };
+
+  export default {
+    name: 'roleList',
+    data() {
+      return {
+        listQuery: Object.assign({}, defaultListQuery),
+        list: null,
+        total: null,
+        listLoading: false,
+        dialogVisible: false,
+        isEdit: false,
+        compList:[],
+      }
+    },
+    created() {
+      this.getList();
+      this.getcompList();
+    },
+    filters: {
+      formatDateTime(time) {
+        if (time == null || time === '') {
+          return 'N/A';
+        }
+        let date = new Date(time);
+        return formatDate(date, 'yyyy-MM-dd hh:mm:ss')
+      }
+    },
+    methods: {
+      /** 获取供应商下拉列表 */
+      getcompList() {
+        selectCompList().then(response => {
+          // console.log("获取供应商下拉列表",response);
+          this.compList = response.data;
+        });
+      },
+      handleResetSearch() {
+        this.listQuery = Object.assign({}, defaultListQuery);
+        this.getList();
+      },
+      handleSearchList() {
+        this.listQuery.pageNo = 1;
+        this.getList();
+      },
+      handleSizeChange(val) {
+        this.listQuery.pageNo = 1;
+        this.listQuery.pageSize = val;
+        this.getList();
+      },
+      handleCurrentChange(val) {
+        this.listQuery.pageNo = val;
+        this.getList();
+      },
+
+      handleDelete(index, row) {
+        this.$confirm('是否要删除该关注?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let id = [];
+          id.push(row.id);
+          let params=new URLSearchParams();
+          params.append("id",id);
+          console.log('del-params',params);
+          deleteIntention(params).then(response => {
+            this.$message({
+              type: 'success',
+              message: '删除成功!'
+            });
+            this.getList();
+          });
+        });
+      },
+      getList() {
+        this.listLoading = true;
+        fetchList(this.listQuery).then(response => {
+          console.log('response',JSON.parse(JSON.stringify(response)));
+          this.listLoading = false;
+          this.list = response.data.list;
+          this.total = response.data.total;
+        }).catch(err => {
+          this.listLoading = false;
+        });
+      }
+    }
+  }
+</script>
+<style></style>
+
+

src/views/pms/origin/components/originDetail.vue

@@ -55,7 +55,7 @@
           v-model="origin.summary"
           :autosize="true"></el-input>
       </el-form-item>
-      <el-form-item label="产出物">
+      <el-form-item label="产出物" v-if="isEdit">
         <div style="text-align: right;"><el-button size="mini" class="btn-add" @click="handleAddOriginProduct()">添加产出物</el-button></div>
         <div class="table-container">
           <el-table ref="roleTable"

src/views/pms/origin/index.vue

@@ -23,6 +23,16 @@
           <el-form-item label="输入搜索：">
             <el-input v-model="listQuery.keyword" class="input-width" placeholder="生产地名称" clearable></el-input>
           </el-form-item>
+          <el-form-item label="供应商：">
+            <el-select v-model="listQuery.compId" placeholder="全部" clearable>
+              <el-option
+                v-for="item in compList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
         </el-form>
       </div>
     </el-card>
@@ -152,12 +162,14 @@
 <script>
   import {fetchList,createorigin,deleteOrigin,getorigin,updateorigin} from '@/api/origin';
   import {formatDate} from '@/utils/date';
+  import {selectCompList} from '@/api/product';
   import {originsave,originupdate,origindelete} from '@/api/permissions'
 
   const defaultListQuery = {
     pageNo: 1,
     pageSize: 5,
-    keyword: null
+    keyword: null,
+    compId:null,
   };
 
   export default {
@@ -167,6 +179,7 @@
         originsave,
         originupdate,
         origindelete,
+        compList:[],
         listQuery: Object.assign({}, defaultListQuery),
         list: null,
         total: null,
@@ -177,6 +190,7 @@
     },
     created() {
       this.getList();
+      this.getcompList();
     },
     filters: {
       formatDateTime(time) {
@@ -188,8 +202,16 @@
       }
     },
     methods: {
+      /** 获取供应商下拉列表 */
+      getcompList() {
+        selectCompList().then(response => {
+          // console.log("获取供应商下拉列表",response);
+          this.compList = response.data;
+        });
+      },
       handleResetSearch() {
         this.listQuery = Object.assign({}, defaultListQuery);
+        this.getList();
       },
       handleSearchList() {
         this.listQuery.pageNo = 1;

src/views/pms/product/components/ProductInfoDetail.vue

@@ -67,6 +67,9 @@
           :inactive-value="0">
         </el-switch>
       </el-form-item>
+      <el-form-item label="库存：" >
+        <el-input v-model="value.stock"></el-input>
+      </el-form-item>
       <el-form-item label="生产日期：">
         <el-input v-model="value.dateOfManufacture"></el-input>
         <!-- <el-date-picker

src/views/pms/product/index.vue

@@ -63,6 +63,16 @@
               </el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="供应商：">
+            <el-select v-model="listQuery.compId" placeholder="全部" clearable>
+              <el-option
+                v-for="item in compList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
         </el-form>
       </div>
     </el-card>
@@ -103,6 +113,11 @@
             <p>货号：{{scope.row.productSn}}</p>
           </template>
         </el-table-column>
+        <el-table-column label="库存" width="120" align="center">
+          <template slot-scope="scope">
+            {{scope.row.stock}}
+          </template>
+        </el-table-column>
         <el-table-column label="标签" width="140" align="center">
           <template slot-scope="scope">
             <p>上架：
@@ -288,12 +303,13 @@
     updateRecommendStatus,
     updatePublishStatus,
     updateVerifyStatus,
-  } from '@/api/product'
-  import {fetchList as fetchSkuStockList,update as updateSkuStockList} from '@/api/skuStock'
-  import {fetchList as fetchProductAttrList} from '@/api/productAttr'
-  import {fetchList as fetchBrandList} from '@/api/brand'
-  import {fetchListWithChildren} from '@/api/productCate'
-  import {verifyproduct,delproduct,updateproduct,createproduct} from '@/api/permissions'
+  } from '@/api/product';
+  import {fetchList as fetchSkuStockList,update as updateSkuStockList} from '@/api/skuStock';
+  import {fetchList as fetchProductAttrList} from '@/api/productAttr';
+  import {fetchList as fetchBrandList} from '@/api/brand';
+  import {fetchListWithChildren} from '@/api/productCate';
+  import {selectCompList} from '@/api/product';
+  import {verifyproduct,delproduct,updateproduct,createproduct} from '@/api/permissions';
   const defaultListQuery = {
     keyword: null,
     pageNum: 1,
@@ -302,7 +318,8 @@
     verifyStatus: null,
     productSn: null,
     productCategoryId: null,
-    brandId: null
+    brandId: null,
+    compId:null,
   };
   export default {
     name: "productList",
@@ -313,6 +330,7 @@
         updateproduct,
         delproduct,
         verifyproduct,
+        compList:[],
         editSkuInfo:{
           dialogVisible:false,
           productId:null,
@@ -386,6 +404,7 @@
       this.getList();
       this.getBrandList();
       this.getProductCateList();
+      this.getcompList();
     },
     watch: {
       selectProductCateValue: function (newValue) {
@@ -407,6 +426,13 @@
       }
     },
     methods: {
+      /** 获取供应商下拉列表 */
+      getcompList() {
+        selectCompList().then(response => {
+          // console.log("获取供应商下拉列表",response);
+          this.compList = response.data;
+        });
+      },
       getProductSkuSp(row, index) {
         let spData = JSON.parse(row.spData);
         if(spData!=null&&index<spData.length){
@@ -584,6 +610,7 @@
       handleResetSearch() {
         this.selectProductCateValue = [];
         this.listQuery = Object.assign({}, defaultListQuery);
+        this.getList();
       },
       handleDelete(index, row){
         this.$confirm('是否要进行删除操作?', '提示', {