细节

src/common/model/goods/Index.js

@@ -95,7 +95,7 @@ export default {
       'status', 'spec_type', 'deduct_stock_type', 'is_restrict', 'content',
       'selling_point', 'serviceIds', 'sales_initial', 'is_points_gift',
       'is_points_discount', 'is_enable_grade', 'is_alone_grade', 'is_ind_dealer',
-      'dealer_money_type', 'first_money', 'second_money', 'third_money', 'cmmdty_model','is_check','goods_source','delivery_time'
+      'dealer_money_type', 'first_money', 'second_money', 'third_money', 'cmmdty_model','is_check','goods_source','delivery_time','is_in_store'
     ])
     return {
       ...goodsFormData,

src/views/goods/modules/Update.vue

@@ -409,9 +409,9 @@
                           <span>{{ ' ' }}</span>
                         </span>
                       </p>
-                      <p class="operation">
+                      <p class="operation" style="text-align: right;">
                         <a href="javascript:void(0);" class="edit" @click="handleEdit(index, item)">编辑</a>
-                        <a href="javascript:void(0);" class="delete" @click="handleDelete(index)">删除</a>
+                        <a href="javascript:void(0);" style="margin-left: 6px;" class="delete" @click="handleDelete(index)">删除</a>
                       </p>
                     </template>
                   </a-table>
@@ -630,8 +630,8 @@ export default {
           // 第二次赋值 (适用于动态渲染的form-item)
           this.$nextTick(() => {
             this.form.setFieldsValue(GoodsModel.getFieldsValue2())
+            this.ruleList = this.formData.goods.rules ? this.formData.goods.rules : []
             this.onForceUpdate()
-            // console.log(this.formData.formData.goods.skuList)
           })
         }
         this.isLoading = false

src/views/recovery/order/Index.vue

@@ -40,6 +40,10 @@
       bordered
       :pagination="false"
     >
+     <!-- 商品名称 -->
+     <span slot="recovery_name" slot-scope="text, item">
+        <p style="white-space: pre-wrap">{{ text }}</p>
+      </span>
       <!-- 操作项 -->
       <span class="actions" slot="action" slot-scope="item">
         <router-link
@@ -93,20 +97,23 @@ const columns = [
   {
     title: '回收名称',
     dataIndex: 'recovery_name',
+    width: '200px',
     scopedSlots: { customRender: 'recovery_name' },
   },
   {
     title: '回收类型',
+    width: '90px',
     dataIndex: 'recovery_type_text',
     scopedSlots: { customRender: 'recovery_type_text' },
   },
   {
     title: '姓名',
+    width: '90px',
     dataIndex: 'username',
   },
   {
     title: '服务时间',
-    width: '180px',
+    width: '160px',
     dataIndex: 'server_time',
   },
   {
@@ -136,7 +143,7 @@ const columns = [
   },
   {
     title: '操作',
-    width: '100px',
+    width: '120px',
     fixed: 'right',
     scopedSlots: { customRender: 'action' },
   },