Qukatie 7 månader sedan
förälder
incheckning
f2a2044e23

+ 3 - 0
src/enums/column-name.js

@@ -1908,6 +1908,9 @@ const columnName = [{
   },{
     code: 422,
     name: '轮胎商城-统计分析-出库统计(L)'
+  },{
+    code: 423,
+    name: '轮胎商城-积分商城-客户积分列表页(L)'
   }
 ]
 export const getColumnName = (key) => {

+ 42 - 13
src/router/views/index.js

@@ -2576,19 +2576,6 @@ export default [{
     component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/basicData/commodityInformation/index')
   }]
 }, {
-  path: '/tirePartsMall/basicData/pointsGoods/index',
-  component: Layout,
-  hidden: true,
-  children: [{
-    path: '/tirePartsMall/basicData/pointsGoods/index',
-    name: '积分商品',
-    meta: {
-      i18n: '/tirePartsMall/basicData/pointsGoods/index',
-      keepAlive: true,
-    },
-    component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/basicData/commodityInformation/index')
-  }]
-}, {
   path: '/tirePartsMall/purchasingManagement/warehouseEntryOrder/index',
   component: Layout,
   hidden: true,
@@ -3752,6 +3739,48 @@ export default [{
   }]
 },
 {
+  path: '/tirePartsMall/pointsMall/customerPoints/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/tirePartsMall/pointsMall/customerPoints/index',
+    name: '积分客户(L)',
+    meta: {
+      i18n: '/tirePartsMall/pointsMall/customerPoints/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/pointsMall/customerPoints/index')
+  }]
+},
+{
+  path: '/tirePartsMall/pointsMall/pointsGoods/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/tirePartsMall/pointsMall/pointsGoods/index',
+    name: '积分商品(L)',
+    meta: {
+      i18n: '/tirePartsMall/pointsMall/pointsGoods/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/pointsMall/pointsGoods/index')
+  }]
+},
+{
+  path: '/tirePartsMall/pointsMall/pointsGoods/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/tirePartsMall/pointsMall/pointsGoods/index',
+    name: '积分商品(L)',
+    meta: {
+      i18n: '/tirePartsMall/pointsMall/pointsGoods/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/pointsMall/pointsGoods/index')
+  }]
+},
+{
   path: '/tirePartsMall/financingManagement/balanceRecharge/index',
   component: Layout,
   hidden: true,

+ 18 - 1
src/views/tirePartsMall/basicData/listingManagement/commodity.json

@@ -14,7 +14,7 @@
     "delBtn": false,
     "menuWidth": 80,
     "searchSpan": 8,
-    "searchMenuSpan": 8,
+    "searchMenuSpan": 24,
     "searchMenuPosition": "right",
     "border": true,
     "index": true,
@@ -152,6 +152,23 @@
         }],
         "searchValue": 0,
         "searchLabelWidth": 120
+      },
+      {
+        "label": "是否积分商品",
+        "prop": "whetherIntegral",
+        "search":true,
+        "type":"select",
+        "overHidden": true,
+        "clearable": false,
+        "dicData": [{
+          "label": "是",
+          "value": 1
+        }, {
+          "label": "否",
+          "value": 0
+        }],
+        "searchValue": 0,
+        "searchLabelWidth": 120
       }
     ]
   }

+ 8 - 338
src/views/tirePartsMall/pointsMall/customerPoints/index.vue

@@ -5,8 +5,8 @@
                 v-model="form" id="out-table" :header-cell-class-name="headerClassName" ref="crud" @row-del="rowDel"
                 @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
                 @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange"
-                @resetColumn="resetColumn('crud', 'option', 'optionBack', 375)"
-                @saveColumn="saveColumn('crud', 'option', 'optionBack', 375)" @on-load="onLoad">
+                @resetColumn="resetColumn('crud', 'option', 'optionBack', 423)"
+                @saveColumn="saveColumn('crud', 'option', 'optionBack', 423)" @on-load="onLoad">
                 <template slot="menuLeft">
                     <el-button type="primary" size="small" icon="el-icon-plus" @click="addButton">新 增
                     </el-button>
@@ -57,7 +57,7 @@ export default {
                 menuWidth: 140,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 6,
+                searchMenuSpan: 18,
                 border: true,
                 index: true,
                 addBtn: false,
@@ -85,361 +85,31 @@ export default {
                         },
                         hide: true,
                         showColumn: false,
-                        searchOrder: 1,
                     },
                     {
                         label: "客户名称",
                         prop: "corpName",
-                        width: "120",
                         overHidden: true,
                     },
                     {
-                        label: "合同号",
+                        label: "积分有效期",
                         prop: "contractNo",
-                        width: "140",
                         overHidden: true,
-                        search: true,
-                        searchOrder: 2,
                     },
                     {
-                        label: "提单号",
+                        label: "产生积分",
                         prop: "billNo",
-                        width: "100",
                         overHidden: true,
-                        search: true,
-                        searchOrder: 3,
                     },
                     {
-                        label: "放单方式",
+                        label: "使用积分",
                         prop: "orderReleaseMethod",
-                        width: "120",
                         overHidden: true,
                     },
                     {
-                        label: "订单号",
+                        label: "余额",
                         prop: "orderNo",
-                        width: "80",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 9,
-                    },
-                    {
-                        label: "箱号",
-                        prop: "boxNo",
-                        width: "80",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 4,
-                    },
-                    {
-                        label: "订单状态",
-                        prop: "orderStatus",
-                        width: "150",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 14,
-                        type: "select",
-                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=order_Status",
-                        props: {
-                            label: "dictValue",
-                            value: "dictValue"
-                        }
-                    },
-                    {
-                        label: "审核状态",
-                        prop: "businessStatus",
-                        width: "100",
-                        overHidden: true,
-                    },
-                    // {
-                    //     label: "收货款",
-                    //     prop: "whetherReceivedDownPayments",
-                    //     width: "120",
-                    //     overHidden: true,
-                    // },
-                    // {
-                    //     label: "付汇",
-                    //     prop: "whetherReceivedBalancePayment",
-                    //     width: "120",
-                    //     overHidden: true,
-                    // },
-                    {
-                        label: "审单状态",
-                        prop: "reviewStatus",
-                        width: "100",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 15,
-                        type: "select",
-                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=audit_status",
-                        props: {
-                            label: "dictValue",
-                            value: "dictValue"
-                        },
-                        hide: true,
-                        showColumn: false,
-                    },
-                    {
-                        label: '操作员',
-                        prop: 'operatorName',
-                        search: true,
-                        searchOrder: 16,
-                        overHidden: true
-                    },
-                    {
-                        label: "合同日期",
-                        prop: "contractDate",
-                        width: "120",
-                        search: true,
-                        searchOrder: 5,
-                        searchProp: "contractDateList",
-                        type: "date",
-                        unlinkPanels: true,
-                        searchRange: true,
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd HH:mm:ss",
-                        searchDefaultTime: ["00:00:00", "23:59:59"],
-                    },
-                    {
-                        label: "国家",
-                        prop: "country",
-                        width: "80",
-                        overHidden: true
-                    },
-                    {
-                        label: "通关进度",
-                        prop: "clearanceSpeedOfProgress",
-                        width: "120",
                         overHidden: true,
-                        search: true,
-                        searchOrder: 11,
-                    },
-                    {
-                        label: '国外发货人',
-                        prop: "abroadConsignorId",
-                        width: "120",
-                        search: true,
-                        type: 'select',
-                        filterable: true,
-                        remote: true,
-                        searchOrder: 12,
-                        dicUrl: "/api/blade-los/bcorps/listByType?corpTypeName=国外工厂&cnName={{key}}",
-                        props: {
-                            label: 'cnName',
-                            value: 'id',
-                            res: 'data.records'
-                        },
-                        hide: true,
-                        showColumn: false,
-                    },
-                    {
-                        label: "国外发货人",
-                        prop: "abroadConsignorCname",
-                        width: "120",
-                        overHidden: true,
-                    },
-                    {
-                        label: '国内收货人',
-                        prop: "domesticConsigneeId",
-                        width: "120",
-                        search: true,
-                        type: 'select',
-                        filterable: true,
-                        remote: true,
-                        searchOrder: 13,
-                        dicUrl: "/api/blade-los/bcorps/listByType?corpTypeName=国内贸易商&cnName={{key}}",
-                        props: {
-                            label: 'cnName',
-                            value: 'id',
-                            res: 'data.records'
-                        },
-                        hide: true,
-                        showColumn: false,
-                    },
-                    {
-                        label: "国内收货人",
-                        prop: "domesticConsigneeCname",
-                        width: "120",
-                        overHidden: true,
-                    },
-                    {
-                        label: '资金方',
-                        prop: "fundingParty",
-                        width: "100",
-                        overHidden: true,
-                    },
-                    {
-                        label: "付汇记录",
-                        prop: "paymentRecord",
-                        width: "120",
-                        overHidden: true
-                    },
-                    {
-                        label: "运输方式",
-                        prop: "typeOfShipping",
-                        width: "120",
-                        overHidden: true
-                    },
-                    {
-                        label: "起运港",
-                        prop: "polCnName",
-                        width: "80",
-                        overHidden: true
-                    },
-                    {
-                        label: "目的港",
-                        prop: "podCnName",
-                        width: "80",
-                        overHidden: true
-                    },
-                    {
-                        label: "开船日期",
-                        prop: "etd",
-                        width: "120",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 6,
-                        searchProp: "etdList",
-                        type: "date",
-                        unlinkPanels: true,
-                        searchRange: true,
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd HH:mm:ss",
-                        searchDefaultTime: ["00:00:00", "23:59:59"],
-                    },
-                    {
-                        label: "预计到港",
-                        prop: "estimateReachHarbor",
-                        width: "120",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 7,
-                        searchProp: "estimateReachHarborList",
-                        type: "date",
-                        unlinkPanels: true,
-                        searchRange: true,
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd HH:mm:ss",
-                        searchDefaultTime: ["00:00:00", "23:59:59"],
-                    },
-                    {
-                        label: "实际到港",
-                        prop: "actualReachHarbor",
-                        width: "120",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 8,
-                        searchProp: "actualReachHarborList",
-                        type: "date",
-                        unlinkPanels: true,
-                        searchRange: true,
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd HH:mm:ss",
-                        searchDefaultTime: ["00:00:00", "23:59:59"],
-                    },
-                    {
-                        label: "PI发票号",
-                        prop: "InvoiceNo",
-                        width: "120",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 10,
-                        hide: true,
-                        showColumn: false,
-                    },
-                    {
-                        label: "币别",
-                        prop: "currency",
-                        width: "80",
-                        overHidden: true
-                    },
-                    {
-                        label: "付款方式",
-                        prop: "advanceRatio",
-                        width: "120",
-                        overHidden: true
-                    },
-                    {
-                        label: "预付金额(USD)",
-                        prop: "prepaidAmount",
-                        width: "120",
-                        overHidden: true
-                    },
-                    {
-                        label: "总金额(USD)",
-                        prop: "goodsValue",
-                        width: "100",
-                        overHidden: true
-                    },
-                    {
-                        label: "利润",
-                        prop: "profit",
-                        width: "100",
-                        overHidden: true
-                    },
-                    {
-                        label: "首款实收(USD)",
-                        prop: "firstPaidInPayment",
-                        width: "120",
-                        overHidden: true
-                    },
-                    {
-                        label: "尾款实收(USD)",
-                        prop: "finalPaymentReceived",
-                        width: "120",
-                        overHidden: true
-                    },
-                    {
-                        label: '贸易方式',
-                        prop: "tradeMode",
-                        width: "100",
-                        overHidden: true
-                    },
-                    {
-                        label: '成交方式',
-                        prop: "transactionMethod",
-                        width: "100",
-                        overHidden: true
-                    },
-                    {
-                        label: "创建人",
-                        prop: "createUserName",
-                        width: "80",
-                        overHidden: true
-                    },
-                    {
-                        label: "创建日期",
-                        prop: "createTime",
-                        width: "100",
-                        overHidden: true
-                    },
-                    {
-                        label: "修改人",
-                        prop: "updateUserName",
-                        width: "80",
-                        overHidden: true
-                    },
-                    {
-                        label: "修改日期",
-                        prop: "updateTime",
-                        width: "100",
-                        overHidden: true
-                    },
-                    {
-                        label: "备注",
-                        prop: "remarks",
-                        width: "80",
-                        overHidden: true
-                    },
-                    {
-                        label: "多选",
-                        prop: "checkbox",
-                        overHidden: true,
-                        search: true,
-                        searchSpan: 18,
-                        searchOrder: 16,
-                        hide: true,
-                        showColumn: false,
                     }
                 ]
             },
@@ -451,7 +121,7 @@ export default {
         dicSelect
     },
     async created() {
-        this.option = await this.getColumnData(this.getColumnName(375), this.optionBack);
+        this.option = await this.getColumnData(this.getColumnName(423), this.optionBack);
     },
     activated() { },
     methods: {

+ 0 - 0
src/views/tirePartsMall/basicData/pointsGoods/components/index.vue → src/views/tirePartsMall/pointsMall/pointsGoods/components/index.vue


+ 0 - 0
src/views/tirePartsMall/basicData/pointsGoods/configuration/mainList.json → src/views/tirePartsMall/pointsMall/pointsGoods/configuration/mainList.json


+ 0 - 0
src/views/tirePartsMall/basicData/pointsGoods/detailsPage.vue → src/views/tirePartsMall/pointsMall/pointsGoods/detailsPage.vue


+ 1 - 1
src/views/tirePartsMall/basicData/pointsGoods/index.vue → src/views/tirePartsMall/pointsMall/pointsGoods/index.vue

@@ -332,13 +332,13 @@ export default {
     onLoad(page, params = {}) {
       let data = this.deepClone(Object.assign(params, this.search));
       data.whetherIntegral="1"
+      console.log(data,1111)
       this.loading = true;
       getList({
         ...data,
         current: page.currentPage,
         size: page.pageSize
       }).then(res => {
-        console.log(123214);
         this.dataList = res.data.data.records ? res.data.data.records : [];
         this.page.total = res.data.data.total;
         this.$nextTick(() => {

+ 0 - 0
src/views/tirePartsMall/basicData/pointsGoods/js/optionList.js → src/views/tirePartsMall/pointsMall/pointsGoods/js/optionList.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 2657 - 2140
src/views/tirePartsMall/pointsMall/pointsOrder/detailsPage.vue


+ 675 - 602
src/views/tirePartsMall/pointsMall/pointsOrder/index.vue

@@ -1,622 +1,695 @@
 <template>
     <div>
-        <basic-container v-if="isShow">
-            <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :search.sync="query"
-                v-model="form" id="out-table" :header-cell-class-name="headerClassName" ref="crud" @row-del="rowDel"
-                @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
-                @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange"
-                @resetColumn="resetColumn('crud', 'option', 'optionBack', 375)"
-                @saveColumn="saveColumn('crud', 'option', 'optionBack', 375)" @on-load="onLoad">
-                <template slot="menuLeft">
-                    <el-button type="primary" size="small" icon="el-icon-plus" @click="addButton">新 增
-                    </el-button>
-                    <el-button type="warning" size="small" @click="outExport">导 出
-                    </el-button>
-                </template>
-                <template slot="menu" slot-scope="{ row, index }">
-                    <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>
-                    <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)"
-                        :disabled="row.orderStatus != '录入'">删 除</el-button>
-                </template>
-                <template slot="contractNo" slot-scope="{ row }">
-                    <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{ row.contractNo }}</span>
-                </template>
-            </avue-crud>
-        </basic-container>
-        <detailsPage v-if="!isShow" :detailData="detailData" @goBack="goBack"></detailsPage>
+      <basic-container v-show="!detailsOpen">
+        <avue-crud :option="option" :search.sync="search" v-model="form" :table-loading="loading" :data="dataList"
+          ref="crud" :key="key" @on-load="onLoad" @search-change="searchChange" @row-del="rowDel"
+          @expand-change="expandChange" @refresh-change="refreshChange"
+          @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 269)"
+          @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 269)" :page.sync="page">
+          <template slot-scope="{ row }" slot="status">
+            <span v-for="(item, index) in orderStatusList" :key="index">
+              <span v-if="item.dictKey == row.status" :style="{ background: item.colour }" class="bottomBox">
+                {{ item.dictValue }}
+              </span>
+            </span>
+          </template>
+          <template slot-scope="{ row }" slot="actualPaymentStatus">
+            <span v-for="(item, index) in actualStatusList" :key="index">
+              <span v-if="item.dictKey == row.actualPaymentStatus" :style="{ background: item.colour }" class="bottomBox">
+                {{ item.dictValue }}
+              </span>
+            </span>
+          </template>
+          <template slot-scope="{ row }" slot="returnsStatus">
+            <span v-for="(item, index) in returnStatusList" :key="index">
+              <span v-if="item.dictKey == row.returnsStatus" :style="{ background: item.colour }" class="bottomBox">
+                {{ item.dictValue }}
+              </span>
+            </span>
+          </template>
+          <!--actualPaymentStatus-->
+          <template slot-scope="{ row }" slot="expand">
+            <avue-crud :data="row.itemData" :option="itemOption" :table-loading="row.itemLoading" :cell-style="cellStyle"
+              class="itemTable"></avue-crud>
+          </template>
+          <template slot-scope="{type,size,row,index}" slot="menu">
+            <!-- <el-button :size="size" :type="type" @click="check(row)">查看</el-button> -->
+            <el-button :size="size" :type="type"
+              :disabled="row.status != '录入' && row.status != '待确认' && row.item >= 1 || row.businessSource == '外部销售'"
+              @click="$refs.crud.rowDel(row, index)">删除</el-button>
+          </template>
+          <template slot="corpNameSearch">
+            <crop-select v-model="search.corpId" corpType="KH" :refresh="false"></crop-select>
+          </template>
+          <template slot="notCompleteSearch">
+            <el-checkbox v-model="search.notComplete" true-label="1"></el-checkbox>
+          </template>
+          <template slot-scope="{type,size,row,$index}" slot="menuLeft">
+            <el-button icon="el-icon-plus" type="primary" :size="size" @click="detailsOpen = true">新建订单</el-button>
+            <el-button type="warning" icon="el-icon-download" size="small" @click="outExport">导出</el-button>
+          </template>
+          <template slot-scope="{ row, index }" slot="ordNo">
+            <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 2)">{{ row.ordNo }}
+            </span>
+          </template>
+          <template slot-scope="{ row, index }" slot="srcOrdNo">
+            <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 3)">{{ row.srcOrdNo }}
+            </span>
+          </template>
+        </avue-crud>
+      </basic-container>
+      <detailsPage v-if="detailsOpen" @goBack="goBack" :onLoad="form" :detailData="detailData" @backToList="backToList">
+      </detailsPage>
     </div>
-</template>
+  </template>
   
-<script>
-import { getList, remove} from "@/api/tradeAgency/tradeAgency";
-import { getWorkDicts } from "@/api/system/dictbiz";
-import detailsPage from "./detailsPage";
-import { getToken } from "@/util/auth";
-import dicSelect from "@/components/dicSelect/main";
-import _ from "lodash";
-export default {
+  <script>
+  import { getList, remove, getGoodsInfo } from "@/api/tirePartsMall/salesManagement/saleOrder";
+  import detailsPage from "./detailsPage"
+  import { getDetails } from "@/api/tirePartsMall/salesManagement/saleOrder";
+  import { getToken } from "@/util/auth";
+  
+  export default {
+    name: "index",
+    components: {
+      detailsPage
+    },
     data() {
-        return {
-            isShow: true,
-            form: {},
-            query: {
-                checkbox: [],
-                businessType: 'MYDL',
+      return {
+        detailsOpen: false,
+        orderStatusList: [],
+        actualStatusList: [],
+        returnStatusList: [],
+        loading: false,
+        search: {},
+        form: {},
+        dataList: [],
+        detailData: {},
+        page: {
+          pageSize: 20,
+          currentPage: 1,
+          total: 0,
+          pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
+        },
+        key: 0,
+        itemOption: {
+          align: "center",
+          header: false,
+          border: true,
+          menu: false,
+          column: [
+            {
+              label: '商品名称',
+              prop: 'goodsName',
+              width: 200,
+              overHidden: true,
+              // dicData: [],
+              // props: {
+              //   label: 'cname',
+              //   value: 'cname'
+              // },
+              // dicUrl: "/api/blade-sales-part/goodsDesc/goodsListAll"
+            }, {
+              label: '数量',
+              prop: 'goodsNum',
+              overHidden: true,
+              width: 100,
             },
-            loading: false,
-            page: {
-                pageSize: 10,
-                currentPage: 1,
-                total: 0
+            {
+              label: '价格',
+              prop: 'price',
+              overHidden: true,
+              width: 100,
             },
-            selectionList: [],
-            option: {},
-            optionBack: {
-                height: 'auto',
-                calcHeight: 30,
-                menuWidth: 140,
-                tip: false,
-                searchShow: true,
-                searchMenuSpan: 6,
-                border: true,
-                index: true,
-                addBtn: false,
-                viewBtn: false,
-                editBtn: false,
-                delBtn: false,
-                selection: true,
-                searchIcon: true,
-                align: 'center',
-                searchIndex: 3,
-                column: [
-                    {
-                        label: "客户名称",
-                        prop: "corpId",
-                        overHidden: true,
-                        search: true,
-                        type: 'select',
-                        filterable: true,
-                        remote: true,
-                        dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
-                        props: {
-                            label: 'cnName',
-                            value: 'id',
-                            res: 'data.records'
-                        },
-                        hide: true,
-                        showColumn: false,
-                        searchOrder: 1,
-                    },
-                    {
-                        label: "客户名称",
-                        prop: "corpName",
-                        width: "120",
-                        overHidden: true,
-                    },
-                    {
-                        label: "合同号",
-                        prop: "contractNo",
-                        width: "140",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 2,
-                    },
-                    {
-                        label: "提单号",
-                        prop: "billNo",
-                        width: "100",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 3,
-                    },
-                    {
-                        label: "放单方式",
-                        prop: "orderReleaseMethod",
-                        width: "120",
-                        overHidden: true,
-                    },
-                    {
-                        label: "订单号",
-                        prop: "orderNo",
-                        width: "80",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 9,
-                    },
-                    {
-                        label: "箱号",
-                        prop: "boxNo",
-                        width: "80",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 4,
-                    },
-                    {
-                        label: "订单状态",
-                        prop: "orderStatus",
-                        width: "150",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 14,
-                        type: "select",
-                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=order_Status",
-                        props: {
-                            label: "dictValue",
-                            value: "dictValue"
-                        }
-                    },
-                    {
-                        label: "审核状态",
-                        prop: "businessStatus",
-                        width: "100",
-                        overHidden: true,
-                    },
-                    // {
-                    //     label: "收货款",
-                    //     prop: "whetherReceivedDownPayments",
-                    //     width: "120",
-                    //     overHidden: true,
-                    // },
-                    // {
-                    //     label: "付汇",
-                    //     prop: "whetherReceivedBalancePayment",
-                    //     width: "120",
-                    //     overHidden: true,
-                    // },
-                    {
-                        label: "审单状态",
-                        prop: "reviewStatus",
-                        width: "100",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 15,
-                        type: "select",
-                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=audit_status",
-                        props: {
-                            label: "dictValue",
-                            value: "dictValue"
-                        },
-                        hide: true,
-                        showColumn: false,
-                    },
-                    {
-                        label: '操作员',
-                        prop: 'operatorName',
-                        search: true,
-                        searchOrder: 16,
-                        overHidden: true
-                    },
-                    {
-                        label: "合同日期",
-                        prop: "contractDate",
-                        width: "120",
-                        search: true,
-                        searchOrder: 5,
-                        searchProp: "contractDateList",
-                        type: "date",
-                        unlinkPanels: true,
-                        searchRange: true,
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd HH:mm:ss",
-                        searchDefaultTime: ["00:00:00", "23:59:59"],
-                    },
-                    {
-                        label: "国家",
-                        prop: "country",
-                        width: "80",
-                        overHidden: true
-                    },
-                    {
-                        label: "通关进度",
-                        prop: "clearanceSpeedOfProgress",
-                        width: "120",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 11,
-                    },
-                    {
-                        label: '国外发货人',
-                        prop: "abroadConsignorId",
-                        width: "120",
-                        search: true,
-                        type: 'select',
-                        filterable: true,
-                        remote: true,
-                        searchOrder: 12,
-                        dicUrl: "/api/blade-los/bcorps/listByType?corpTypeName=国外工厂&cnName={{key}}",
-                        props: {
-                            label: 'cnName',
-                            value: 'id',
-                            res: 'data.records'
-                        },
-                        hide: true,
-                        showColumn: false,
-                    },
-                    {
-                        label: "国外发货人",
-                        prop: "abroadConsignorCname",
-                        width: "120",
-                        overHidden: true,
-                    },
-                    {
-                        label: '国内收货人',
-                        prop: "domesticConsigneeId",
-                        width: "120",
-                        search: true,
-                        type: 'select',
-                        filterable: true,
-                        remote: true,
-                        searchOrder: 13,
-                        dicUrl: "/api/blade-los/bcorps/listByType?corpTypeName=国内贸易商&cnName={{key}}",
-                        props: {
-                            label: 'cnName',
-                            value: 'id',
-                            res: 'data.records'
-                        },
-                        hide: true,
-                        showColumn: false,
-                    },
-                    {
-                        label: "国内收货人",
-                        prop: "domesticConsigneeCname",
-                        width: "120",
-                        overHidden: true,
-                    },
-                    {
-                        label: '资金方',
-                        prop: "fundingParty",
-                        width: "100",
-                        overHidden: true,
-                    },
-                    {
-                        label: "付汇记录",
-                        prop: "paymentRecord",
-                        width: "120",
-                        overHidden: true
-                    },
-                    {
-                        label: "运输方式",
-                        prop: "typeOfShipping",
-                        width: "120",
-                        overHidden: true
-                    },
-                    {
-                        label: "起运港",
-                        prop: "polCnName",
-                        width: "80",
-                        overHidden: true
-                    },
-                    {
-                        label: "目的港",
-                        prop: "podCnName",
-                        width: "80",
-                        overHidden: true
-                    },
-                    {
-                        label: "开船日期",
-                        prop: "etd",
-                        width: "120",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 6,
-                        searchProp: "etdList",
-                        type: "date",
-                        unlinkPanels: true,
-                        searchRange: true,
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd HH:mm:ss",
-                        searchDefaultTime: ["00:00:00", "23:59:59"],
-                    },
-                    {
-                        label: "预计到港",
-                        prop: "estimateReachHarbor",
-                        width: "120",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 7,
-                        searchProp: "estimateReachHarborList",
-                        type: "date",
-                        unlinkPanels: true,
-                        searchRange: true,
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd HH:mm:ss",
-                        searchDefaultTime: ["00:00:00", "23:59:59"],
-                    },
-                    {
-                        label: "实际到港",
-                        prop: "actualReachHarbor",
-                        width: "120",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 8,
-                        searchProp: "actualReachHarborList",
-                        type: "date",
-                        unlinkPanels: true,
-                        searchRange: true,
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd HH:mm:ss",
-                        searchDefaultTime: ["00:00:00", "23:59:59"],
-                    },
-                    {
-                        label: "PI发票号",
-                        prop: "InvoiceNo",
-                        width: "120",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 10,
-                        hide: true,
-                        showColumn: false,
-                    },
-                    {
-                        label: "币别",
-                        prop: "currency",
-                        width: "80",
-                        overHidden: true
-                    },
-                    {
-                        label: "付款方式",
-                        prop: "advanceRatio",
-                        width: "120",
-                        overHidden: true
-                    },
-                    {
-                        label: "预付金额(USD)",
-                        prop: "prepaidAmount",
-                        width: "120",
-                        overHidden: true
-                    },
-                    {
-                        label: "总金额(USD)",
-                        prop: "goodsValue",
-                        width: "100",
-                        overHidden: true
-                    },
-                    {
-                        label: "利润",
-                        prop: "profit",
-                        width: "100",
-                        overHidden: true
-                    },
-                    {
-                        label: "首款实收(USD)",
-                        prop: "firstPaidInPayment",
-                        width: "120",
-                        overHidden: true
-                    },
-                    {
-                        label: "尾款实收(USD)",
-                        prop: "finalPaymentReceived",
-                        width: "120",
-                        overHidden: true
-                    },
-                    {
-                        label: '贸易方式',
-                        prop: "tradeMode",
-                        width: "100",
-                        overHidden: true
-                    },
-                    {
-                        label: '成交方式',
-                        prop: "transactionMethod",
-                        width: "100",
-                        overHidden: true
-                    },
-                    {
-                        label: "创建人",
-                        prop: "createUserName",
-                        width: "80",
-                        overHidden: true
-                    },
-                    {
-                        label: "创建日期",
-                        prop: "createTime",
-                        width: "100",
-                        overHidden: true
-                    },
-                    {
-                        label: "修改人",
-                        prop: "updateUserName",
-                        width: "80",
-                        overHidden: true
-                    },
-                    {
-                        label: "修改日期",
-                        prop: "updateTime",
-                        width: "100",
-                        overHidden: true
-                    },
-                    {
-                        label: "备注",
-                        prop: "remarks",
-                        width: "80",
-                        overHidden: true
-                    },
-                    {
-                        label: "多选",
-                        prop: "checkbox",
-                        overHidden: true,
-                        search: true,
-                        searchSpan: 18,
-                        searchOrder: 16,
-                        hide: true,
-                        showColumn: false,
-                    }
-                ]
+            {
+              label: '批次号',
+              prop: 'dot',
+              type: "select",
+              disabled: true,
+              allowCreate: true,
+              filterable: true,
+              width: 150,
+              dicData: [],
+              props: {
+                label: "dot",
+                value: "dot"
+              },
+              dicUrl: "/api/blade-sales-part/stockDesc/dotList",
+              overHidden: true,
+            }, {
+              label: '商品编码',
+              prop: 'goodsNo',
+              overHidden: true,
+              width: 150
             },
-            data: [],
-        };
+            // {
+            //   label: '品牌',
+            //   prop: 'brandId',
+            //   disabled: false,
+            //   width: 100,
+            //   overHidden: true,
+            //   props: {
+            //     label: 'cname',
+            //     value: 'id'
+            //   },
+            //   dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP'
+            // },
+            {
+              label: '品牌',
+              prop: 'brandName',
+              overHidden: true,
+              disabled: false,
+              width: 150
+            },
+            {
+              label: '规格型号',
+              prop: 'propertyName',
+              overHidden: true,
+              disabled: false,
+              width: 150
+            },
+            {
+              label: '花纹',
+              prop: 'pattern',
+              overHidden: true,
+              disabled: false,
+              width: 150
+            },
+            {
+              label: '发货数量',
+              prop: 'sendNum',
+              disabled: false,
+              overHidden: true,
+              width: 100,
+            }]
+        },
+        option: {},
+        optionList: {
+          viewBtn: false,
+          editBtn: false,
+          delBtn: false,
+          addBtn: false,
+          index: true,
+          span: 6,
+          border: true,
+          height: "auto",
+          searchMenuPosition: "right",
+          align: "center",
+          size: "small",
+          menuWidth: 50,
+          searchSpan: 6,
+          searchMenuSpan: 24,
+          searchIcon: true,
+          expand: true,
+          expandWidth: 60,
+          searchIndex: 3,
+          highlightCurrentRow: true,
+          dialogWidth: "70%",
+          summaryText: "合计",
+          showSummary: true,
+          sumColumnList: [{
+            name: 'goodsTotalNum',
+            type: 'sum',
+            decimals: 0
+          }, {
+            name: 'totalMoney',
+            type: 'sum',
+          }, {
+              name: 'returnsNumber',
+              type: 'sum',
+          }],
+          column: [{
+            label: '销售单号',
+            prop: "ordNo",
+            search: true,
+            overHidden: true,
+          }, {
+            label: '来源单号',
+            prop: "srcOrdNo",
+            search: true,
+            overHidden: true,
+          },
+          {
+            label: '显示已完成',
+            prop: 'notComplete',
+            overHidden: true,
+            hide: true,
+            search: true,
+            searchslot: true
+          },
+          {
+            label: "业务来源",
+            prop: "businessSource",
+            overHidden: true,
+            search: true,
+            type: 'select',
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=business_Source",
+            props: {
+              label: "dictValue",
+              value: "dictKey"
+            }
+          }, {
+            label: '所属公司',
+            prop: "salesCompanyName",
+            overHidden: true,
+          },
+          {
+            label: '业务对象',
+            prop: "customerName",
+            search: true,
+            remote: true,
+            overHidden: true,
+            cell:true,
+            // type: 'select',
+            // filterable: true,
+            // props: {
+            //   label: 'cname',
+            //   value: 'cname',
+            //   res: 'data.records'
+            // },
+            // dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=KH&cname={{key}}',
+          },
+          {
+            label: '业务员',
+            disabled: false,
+            prop: "salerName",
+            search: true,
+            type: "select",
+            props: {
+              label: "name",
+              value: "name"
+            },
+            dicUrl: "/api/blade-user/salerList",
+            filterable: true,
+            rules: [{
+              required: true,
+              message: " ",
+              trigger: "blur"
+            }]
+          }, {
+            label: '仓库',
+            prop: "storageName",
+            search: true,
+            overHidden: true,
+            // remote: true,
+            type: 'select',
+            props: {
+              label: 'cname',
+              value: 'cname'
+            },
+            dicUrl: '/api/blade-sales-part/storageDesc/listAll?cname={{key}}',
+          }, {
+            label: '行数',
+            prop: "numberRows",
+            overHidden: true,
+          }, {
+            label: '商品名称',
+            prop: "goodsNameJoin",
+            search: true,
+            overHidden: true,
+            // filterable: true,
+            // remote:true,
+            // type: 'select',
+            // props: {
+            //   label: 'cname',
+            //   value: 'cname',
+            //   res: 'data.records'
+            // },
+            // dicUrl: "/api/blade-sales-part/goodsDesc/list?current=1&size=20&cname={{key}}"
+          }, {
+            label: '数量',
+            prop: "goodsTotalNum",
+            overHidden: true,
+          }, {
+            label: '金额',
+            prop: "totalMoney",
+            overHidden: true,
+          }, {
+            label: '已收金额',
+            prop: "paymentAmountTl",
+            overHidden: true,
+          }, {
+            label: '退货数量',
+            prop: "returnsNumber",
+            overHidden: true,
+          }, {
+            label: '退货金额',
+            prop: "returnsAmount",
+            overHidden: true,
+          }, {
+            label: '状态',
+            prop: "status",
+            search: true,
+            overHidden: true,
+            type: 'select',
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=sales_Status",
+            props: {
+              label: "dictValue",
+              value: "dictKey"
+            },
+          }, {
+            label: '结算状态',
+            prop: "actualPaymentStatus",
+            searchProp: 'actualPaymentType',
+            search: true,
+            overHidden: true,
+            type: 'select',
+            dicData: [
+              {
+                label: "待收款",
+                value: 1,
+              },
+              {
+                label: "已收款",
+                value: 2,
+              },
+              {
+                label: "尾款",
+                value: 3,
+              },
+              {
+                label: "已退款",
+                value: 4,
+              }
+            ],
+  
+            // dicUrl: "/api/blade-system/dict-biz/dictionary?code=settlement_Status",
+            // props: {
+            //   label: "dictValue",
+            //   value: "dictKey"
+            // }
+  
+          },
+          {
+            label: '退货状态',
+            prop: "returnsStatus",
+            overHidden: true,
+          },
+          {
+            label: '应结日期',
+            prop: "dueDate",
+            overHidden: true,
+          },
+          {
+            label: '业务日期',
+            prop: "businesDate",
+            searchProp: "businesDateList",
+            type: "date",
+            overHidden: true,
+            search: true,
+            width: 100,
+            unlinkPanels: true,
+            searchRange: true,
+            searchDefaultTime: ["00:00:00", "23:59:59"],
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss"
+          }, {
+            label: '收费日期',
+            prop: "paymentDate",
+            searchProp: "paymentDateList",
+            type: "date",
+            overHidden: true,
+            search: true,
+            width: 100,
+            unlinkPanels: true,
+            searchRange: true,
+            searchDefaultTime: ["00:00:00", "23:59:59"],
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss"
+          }, {
+            label: "制单人",
+            prop: "createUserName",
+            searchProp: "createUser",
+            overHidden: true,
+            width: 100,
+            filterable: true,
+            remote: true,
+            type: "select",
+            dicUrl: "/api/blade-user/page?size=20&current=1&account={{key}}",
+            props: {
+              label: "account",
+              value: "id",
+              res: 'data.records'
+            }
+          }, {
+            label: "制单日期",
+            prop: "createTime",
+            searchProp: "createTimeList",
+            type: "date",
+            overHidden: true,
+            width: 100,
+            searchRange: true,
+            searchDefaultTime: ["00:00:00", "23:59:59"],
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss"
+          }, {
+            label: "更新人",
+            prop: "updateUserName",
+            searchProp: "updateUser",
+            overHidden: true,
+            width: 100,
+            filterable: true,
+            remote: true,
+            type: "select",
+            dicUrl: "/api/blade-user/page?size=20&current=1&account={{key}}",
+            props: {
+              label: "account",
+              value: "id",
+              res: 'data.records'
+            }
+          }, {
+            label: "更新日期",
+            prop: "updateTime",
+            searchProp: "updateTimeList",
+            type: "date",
+            overHidden: true,
+            width: 100,
+            searchRange: true,
+            searchDefaultTime: ["00:00:00", "23:59:59"],
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss"
+          }]
+        }
+      }
     },
-    components: {
-        detailsPage,
-        dicSelect
+    activated() {
+      setTimeout(() => {
+        console.log(this.$route.query, 400)
+        // 主页快捷跳转来的 直接打开新建订单
+        if (this.$route.query.showTrue) {
+          this.$store.commit("IN_LTXS_STATUS");
+          this.detailsOpen = true;
+        }
+        if (this.$route.query.check) {
+          this.editOpen({ id: this.$route.query.check.srcBillId }, 1)
+          this.$store.commit("IN_LTXS_STATUS");
+        }
+        if (this.$route.query.type == 'S') {
+          this.editOpen({ id: this.$route.query.detail.srcParentId }, 1)
+        }
+        if (this.$route.query.jumpId) {
+          this.editOpen({ id: this.$route.query.jumpId }, 1)
+        }
+  
+        this.detailData = {
+          id: this.$route.query.check.billId,
+          check: this.$route.query.check,
+          auditId: this.$route.query.check.id
+        };
+      }, 100);
     },
     async created() {
-        this.option = await this.getColumnData(this.getColumnName(375), this.optionBack);
+      this.option = await this.getColumnData(this.getColumnName(269), this.optionList);
+      this.key++
+      let i = 0;
+      this.option.column.forEach(item => {
+        if (item.search) i++
+      })
+      // if (i % 3 !== 0) {
+      //   const num = 3 - Number(i % 3)
+      //   this.option.searchMenuSpan = num * 8;
+      //   this.option.searchMenuPosition = "right";
+      // }
+      this.getWorkDicts("sales_Status").then(res => {
+        this.orderStatusList = res.data.data
+        console.log(this.orderStatusList);
+      });
+      this.getWorkDicts("settlement_Status").then(res => {
+        this.actualStatusList = res.data.data
+      });
+      this.getWorkDicts("return_Status").then(res => {
+        this.returnStatusList = res.data.data
+      });
     },
-    activated() { },
     methods: {
-        addButton() {
-            this.isShow = false
-        },
-        rowEdit(row) {
-            this.detailData = {
-                id: row.itemId
-            };
-            this.isShow = false
-        },
-        // 删除
-        rowDel(row, index) {
-            this.$confirm("确定将选择数据删除?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning"
-            }).then(() => {
-                remove({ ids: row.itemId }).then(res => {
-                    this.onLoad(this.page, this.query);
-                    this.$message.success("成功删除");
-                })
-            })
-
-        },
-        searchReset() {
-            this.query = this.$options.data().query;
-            this.onLoad(this.page);
-        },
-        // 搜索按钮点击
-        searchChange(params, done) {
-            this.page.currentPage = 1;
-            this.onLoad(this.page, this.query);
-            done();
-        },
-        selectionChange(list) {
-            this.selectionList = list;
-        },
-        currentChange(currentPage) {
-            this.page.currentPage = currentPage;
-        },
-        sizeChange(pageSize) {
-            this.page.pageSize = pageSize;
-        },
-        refreshChange() {
-            this.onLoad(this.page, this.query);
-        },
-        onLoad(page, params = {}) {
-            let obj = {}
-            obj = {
-                ...Object.assign(params, this.query),
-            }
-            this.loading = true;
-            getList(page.currentPage, page.pageSize, obj).then(res => {
-                this.data = res.data.data.records;
-                this.page.total = res.data.data.total;
-                this.$nextTick(() => {
-                    this.$refs.crud.doLayout();
-                    this.$refs.crud.dicInit();
-                });
-            }).finally(() => {
-                this.loading = false;
-            })
-        },
-        // 详情的返回列表
-        goBack() {
-            // 初始化数据
-            if (JSON.stringify(this.$route.query) != "{}") {
-                this.$router.$avueRouter.closeTag();
-                this.$router.push({
-                    path: "/tradeAgency/tradeAgency/index"
-                });
-            }
-            this.detailData = {}
-            this.isShow = true;
-            this.onLoad(this.page, this.query);
-        },
-        outExport() {
-            let config = { params: { ...this.query } }
-            if (config.params) {
-                for (const propName of Object.keys(config.params)) {
-                    const value = config.params[propName];
-                    if (value !== null && typeof (value) !== "undefined") {
-                        if (value instanceof Array) {
-                            for (const key of Object.keys(value)) {
-                                let params = propName + '[' + key + ']';
-                                config.params[params] = value[key]
-                            }
-                            delete config.params[propName]
-                        }
-                    }
+      // 导出
+      outExport() {
+        console.log(this.search, 412)
+        let config = { params: { ...this.search } }
+        if (config.params) {
+          for (const propName of Object.keys(config.params)) {
+            const value = config.params[propName];
+            if (value !== null && typeof (value) !== "undefined") {
+              if (value instanceof Array) {
+                for (const key of Object.keys(value)) {
+                  let params = propName + '[' + key + ']';
+                  config.params[params] = value[key]
                 }
+                delete config.params[propName]
+              }
             }
-            const routeData = this.$router.resolve({
-                path: '/api/blade-los/agentview/export',      //跳转目标窗口的地址
-                query: {
-                    ...config.params,    //括号内是要传递给新窗口的参数
-                    identification: this.url
-                }
+          }
+        }
+        console.log(config, 427)
+        config.params.bsType = 'JF'
+        const routeData = this.$router.resolve({
+          path: '/api/blade-sales-part/order/listExport',      //跳转目标下载地址
+          query: {
+            ...config.params    //括号内是要传递给新窗口的参数
+          }
+        })
+        window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+      },
+      check(row) {
+        this.form = row
+        this.detailsOpen = true
+      },
+      backToList(type) {
+        if (JSON.stringify(this.$route.query) != "{}") {
+          this.$router.$avueRouter.closeTag();
+          this.$router.push({
+            path: "/tirePartsMall/salesManagement/saleOrder/index"
+          });
+        }
+        this.form = {}
+        this.detailsOpen = false
+        if (type === 0) {
+          this.detailData = {}
+        }
+        this.onLoad(this.page, this.search)
+        this.$store.commit("OUT_LTXS_STATUS");
+  
+      },
+      editOpen(row, status) {
+        this.form = row
+        this.detailData = {
+          id: row.id,
+          status: status
+        };
+        console.log(status);
+        this.$store.commit("IN_LTXS_STATUS");
+        this.detailsOpen = true;
+      },
+      //刷新
+      refreshChange() {
+        this.onLoad(this.page, this.search)
+      },
+      expandChange(row) {
+        if (!row.itemData) {
+          getDetails({ id: row.id })
+            .then(res => {
+              this.dataList[row.$index].itemData = res.data.data.orderItemsList;
             })
-            window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
-        },
-        //自定义列保存
-        async saveColumn(ref, option, optionBack, code) {
-            /**
-             * 已定义全局方法,直接使用,saveColumnData保存列数据方法,参数传值(表格名称,当前表格的option数据)
-             * 已定义全局方法,直接使用,getColumnName方法用来获取枚举值,参数根据自己定义的code值获取中文名
-             * 一定要执行异步操作,要等接口成功返回,才能执行下一行代码
-             */
-            const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
-            if (inSave) {
-                this.$message.success("保存成功");
-                //关闭窗口
-                this.$refs[ref].$refs.dialogColumn.columnBox = false;
-                this.searchReset()
-            }
-        },
-        //自定义列重置
-        async resetColumn(ref, option, optionBack, code) {
-            this[option] = this[optionBack];
-            const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
-            if (inSave) {
-                this.$message.success("重置成功");
-                this.$refs[ref].$refs.dialogColumn.columnBox = false;
-                this.searchReset()
-            }
-        },
-        // 更改表格颜色
-        headerClassName(tab) {
-            //颜色间隔
-            let back = ""
-            if (tab.columnIndex >= 0 && tab.column.level === 1) {
-                if (tab.columnIndex % 2 === 0) {
-                    back = "back-one"
-                } else if (tab.columnIndex % 2 === 1) {
-                    back = "back-two"
-                }
-            }
-            return back;
-        },
-
+            .finally(() => {
+              this.dataList[row.$index].itemLoading = false;
+            });
+        }
+      },
+      rowDel(form, index) {
+        this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          remove({ id: form.id }).then(res => {
+            this.$message({
+              type: 'success',
+              message: '删除成功!'
+            });
+            this.dataList.splice(index, 1);
+            this.onLoad(this.page)
+          })
+        }).catch(() => {
+        });
+      },
+      searchChange(params, done) {
+        this.page.currentPage = 1
+        params.notComplete = 1
+        this.onLoad(this.page, params)
+        done();
+      },
+      onLoad(page, params = {}) {
+        params = {
+          ...params,
+          current: page.currentPage,
+          size: page.pageSize,
+          bsType: "JF",
+          ...Object.assign(params, this.search)
+        }
+        this.loading = true
+        this.dataList.forEach(item => {
+          this.$refs.crud.toggleRowExpansion(item, false);
+        });
+        getList(params).then(res => {
+          if (res.data.data.records) {
+            res.data.data.records.forEach(e => {
+              e.itemLoading = true;
+            });
+          }
+          this.dataList = res.data.data.records
+          this.page.total = res.data.data.total
+  
+          this.$nextTick(() => {
+            this.$refs.crud.doLayout()
+            this.$refs.crud.dicInit()
+          })
+          this.loading = false
+        }).finally(() => {
+          this.loading = false
+        })
+      },
+      //自定义列保存
+      async saveColumnTwo(ref, option, optionBack, code) {
+        /**
+         * 已定义全局方法,直接使用,saveColumnData保存列数据方法,参数传值(表格名称,当前表格的option数据)
+         * 已定义全局方法,直接使用,getColumnName方法用来获取枚举值,参数根据自己定义的code值获取中文名
+         * 一定要执行异步操作,要等接口成功返回,才能执行下一行代码
+         */
+        const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
+        if (inSave) {
+          this.$message.success("保存成功");
+          //关闭窗口
+          this.$refs[ref].$refs.dialogColumn.columnBox = false;
+        }
+      },
+      //自定义列重置
+      async resetColumnTwo(ref, option, optionBack, code) {
+        this[option] = this[optionBack];
+        const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
+        if (inSave) {
+          this.$message.success("重置成功");
+          this.$refs[ref].$refs.dialogColumn.columnBox = false;
+        }
+      }
     }
-}
-
-</script>
+  }
+  </script>
+  
+  <style scoped>
+  .itemTable ::v-deep .el-table {
+    margin-left: 50px;
+    width: 100%;
+  }
+  
+  .bottomBox {
+    padding: 3px 6px;
+    border-radius: 12px;
+    color: #fff;
+    font-size: 10px;
+  }
   
-<style scoped>
-::v-deep#out-table .back-one {
-    background: #ecf5ff !important;
-    text-align: center;
-}
-
-::v-deep#out-table .back-two {
-    background: #ecf5ff !important;
-    text-align: center;
-}
-
-.pointerClick {
-    cursor: pointer;
-    color: #1e9fff;
-}
-
-::v-deep .el-col-md-8 {
+  /deep/ .el-col-md-8 {
     width: 24.33333%;
-}
-</style>
+  }
+  </style>
   

Vissa filer visades inte eftersom för många filer har ändrats