添加订单状态

app/admin/view/goods/import_list/index.html

@@ -1,7 +1,20 @@
 <template>
     <el-card shadow="never">
-        <yun-table :columns="columns" ref="yuntable" @render="onTableRender" toolbar="refresh" :auth="{}" :extend="extend" :total-arr="totalArr" :is-showtotal="true"
+        <yun-table :columns="columns" ref="yuntable" @render="onTableRender" toolbar="refresh,settlement" :auth="{}" :extend="extend" :total-arr="totalArr" :is-showtotal="true"
             @data-loaded="handleData">
+            <template #toolbar="{tool}">
+                    <template v-if="tool=='settlement'">
+                            <el-button type="primary" @click="set_jushuitan" title="设置">
+                                <i class="fa fa-cog"></i>
+                                <span class="title">聚水潭</span>
+                            </el-button>
+                            <el-button type="success" @click="set_fengsu" title="设置">
+                               <i class="fa fa-cog"></i>
+                               <span class="title">风速</span>
+                            </el-button>
+
+                        </template>
+                </template>
         </yun-table>
     </el-card>
 </template>
@@ -44,6 +57,25 @@
                 { field: "city", title: "城市", operate: false },
                 { field: "company_name", title: "快递名称", operate: false },
                 { field: "waybill_no", title: "快递单号" },
+                {
+                    field: "order_status", fixed: 'right', title: "订单状态", operate: "select", searchList: { 'Sent': "正常",'OuterSent': "外部已发货",'SentCancelled': "已退款(聚水潭)",'TRADE_CLOSED':"已退款(风速)"}, formatter: function (data, row) {
+                        let tag = Yunqi.formatter.tag;
+                        if (row.order_status == 'OuterSent') {
+                            tag.value = '外部已发货';
+                            tag.type = 'warning';
+                        } else if (row.order_status == 'SentCancelled') {
+                            tag.value = '已退款';
+                            tag.type = 'danger';
+                        }else if (row.order_status == 'TRADE_CLOSED') {
+                            tag.value = '已退款';
+                            tag.type = 'danger';
+                        } else{
+                            tag.value = '正常';
+                            tag.type = 'success';
+                        }
+                        return tag;
+                    }
+                },
                 { field: "goods_title", title: "产品名称", width: 300, align: 'left' },
                 { field: "goods_info", title: "商品信息", width: 300, align: 'left' },
                 { field: "sku_id", title: "规格id" },
@@ -161,6 +193,30 @@
                 })
 
             },
+            set_jushuitan: function (row) {
+                let that = this;
+                Yunqi.api.open({
+                    url: 'goods/import_list/set_jushuitan',
+                    width: 1000,
+                    title: __('聚水潭同步数据设置'),
+                    icon: 'fa fa-cog',
+                    close: function (r) {
+                        that.$refs.yuntable.reload();
+                    }
+                });
+            },
+            set_fengsu: function (row) {
+                let that = this;
+                Yunqi.api.open({
+                    url: 'goods/import_list/set_fengsu',
+                    width: 1000,
+                    title: __('风速同步数据设置'),
+                    icon: 'fa fa-cog',
+                    close: function (r) {
+                        that.$refs.yuntable.reload();
+                    }
+                });
+            },
 
         },
         onLoad: function (query) {

app/admin/view/shop/shop_delivery/index.html

@@ -81,6 +81,25 @@
                 {field: 'settlement_data', title: __('结算时间'),operate: 'daterange',formatter: Yunqi.formatter.datetime},
                 {field: 'status', title: __('结算状态'), operate: 'select', width:85,searchList: {1: __('待结算'),2: __('已结算')},formatter:Yunqi.formatter.tag},
                 {field: 'createtime', title: __('创建时间'), width:120,formatter: Yunqi.formatter.datetime,operate:false,sortable: true},
+                {
+                    field: "order_status", fixed: 'right', title: "订单状态", operate: "select", searchList: { 'Sent': "正常",'OuterSent': "外部已发货",'SentCancelled': "已退款(聚水潭)",'TRADE_CLOSED':"已退款(风速)"}, formatter: function (data, row) {
+                        let tag = Yunqi.formatter.tag;
+                        if (row.order_status == 'OuterSent') {
+                            tag.value = '外部已发货';
+                            tag.type = 'warning';
+                        } else if (row.order_status == 'SentCancelled') {
+                            tag.value = '已退款';
+                            tag.type = 'danger';
+                        }else if (row.order_status == 'TRADE_CLOSED') {
+                            tag.value = '已退款';
+                            tag.type = 'danger';
+                        } else{
+                            tag.value = '正常';
+                            tag.type = 'success';
+                        }
+                        return tag;
+                    }
+                }
                 
             ],
             totalArr: [