Browse Source

修改积分商城

Qukatie 8 months ago
parent
commit
3bfb3b02c9

+ 1 - 1
src/views/tirePartsMall/pointsMall/customerPoints/detailsPage.vue

@@ -193,7 +193,7 @@ export default {
                 spinner: 'el-icon-loading',
                 background: 'rgba(255,255,255,0.7)'
             });
-            getDetail({ corpId: '1823603949693837314' }).then(res => {
+            getDetail({ corpId:id }).then(res => {
                 this.form = res.data.data
             }).finally(() => {
                 loading.close()

+ 27 - 86
src/views/tirePartsMall/pointsMall/pointsOrder/detailsPage.vue

@@ -74,9 +74,6 @@
                         </el-select>
                         <span v-else>{{ row.dot }}</span>
                     </template>
-                    <template slot="subTotalMoney" slot-scope="{ row }">{{ row.goodsNum * row.price
-                        }}</template>
-
                     <template slot="remarks" slot-scope="{ row }">
                         <el-input v-if="!mingxibaocun" size="small" v-model="row.remarks"
                             style="width: 100%"></el-input>
@@ -333,7 +330,7 @@ export default {
                         width: 120
                     },
                     {
-                        label: "单价",
+                        label: "积分",
                         prop: "price",
                         overHidden: true,
                         slot: true,
@@ -629,16 +626,16 @@ export default {
                     prop: "expressNo"
                 },
                 {
-                    label: '销售金额',
+                    label: '销售积分',
                     prop: "salesAmount",
                     disabled: true
                 },
                 {
-                    label: '总金额',
+                    label: '总积分',
                     prop: "totalMoney",
                     disabled: true
                 }, {
-                    label: '已收金额',
+                    label: '已收积分',
                     prop: "paymentAmountTl",
                     disabled: true
                 }, {
@@ -770,7 +767,7 @@ export default {
                     }]
                 },
                 {
-                    label: '价格',
+                    label: '积分',
                     prop: 'price',
                     overHidden: true,
                     width: 100,
@@ -783,7 +780,7 @@ export default {
                     }, {
                         validator: (rule, value, callback) => {
                             if (value < 0) {
-                                callback(new Error("价格不能小于0"));
+                                callback(new Error("积分不能小于0"));
                             } else {
                                 callback();
                             }
@@ -863,7 +860,7 @@ export default {
                     addDisplay: false
                 },
                 {
-                    label: '计',
+                    label: '积分合计',
                     prop: 'subTotalMoney',
                     overHidden: true,
                     width: 100,
@@ -903,7 +900,7 @@ export default {
                     label: '支付编号',
                     prop: 'serialNumber'
                 }, {
-                    label: '金额',
+                    label: '积分',
                     prop: 'amount'
                 }, {
                     label: '类型',
@@ -963,7 +960,6 @@ export default {
         detailData: Object
     },
     async created() {
-        console.log(this.detailData.id)
         console.log(JSON.parse(localStorage.getItem('saber-tenantId')).content, 959)
         if (JSON.parse(localStorage.getItem('saber-tenantId')).content == '069164') {
             this.reportName = '轮胎商城-玉玲珑销售单'
@@ -1150,7 +1146,7 @@ export default {
         })
 
         if (this.detailData.id) {
-            this.getDetailsfun()
+            this.refresh(this.detailData.id)
         }
 
     },
@@ -1275,6 +1271,11 @@ export default {
             getDetails({
                 id: this.detailData.id
             }).then(res => {
+                res.data.data.orderItemsList.forEach((items) => {
+                    if (!items.subTotalMoney) {
+                        items.subTotalMoney = Number(items.goodsNum * items.price) ? Number(items.goodsNum * items.price).toFixed(2) : 0
+                    }
+                })
                 this.form = res.data.data
                 this.form.orderItemsList = res.data.data.orderItemsList
             })
@@ -1327,14 +1328,14 @@ export default {
                 this.page.total = 0
             }
         },
-        // 商品信息价格计算
+        // 商品信息积分计算
         amountChange(value, row) {
             if (value > 0) {
                 this.$refs.crud.toggleRowSelection(row, true);
             } else {
                 this.$refs.crud.toggleRowSelection(row, false);
             }
-            // 价格
+            // 积分
             // if (!row.price) {
             //     row.price = 0;
             // }
@@ -1382,15 +1383,15 @@ export default {
                     // poNo: item.poNo,
                     whether: item.whether,
                     units: item.unit,
-                    // 
+                    // 积分合
                     subTotalMoney: Number(item.goodsNum * item.price) ? Number(item.goodsNum * item.price).toFixed(2) : 0,
                     // 备注
                     remarks: item.remarks,
                     // 批次号的状态
                     dotedittype: false,
-                    // 价格数量
+                    // 积分数量
                     goodsNumtype: false,
-                    // 价格
+                    // 积分
                     pricetype: false,
                 }
                 for (let ite of item.goodsFilesList) {
@@ -1442,7 +1443,7 @@ export default {
                 for (let item of this.goodsListShow) {
                     item.goodsNum = item.goodsNum ? item.goodsNum : 0
                 }
-                // // 获取单价数据
+                // // 获取积分数据
                 // for(let item of this.goodsListShow) {
                 //     let page = {}
                 //     if (this.form.storageId) {
@@ -1465,7 +1466,7 @@ export default {
                 row.whether = res.data.data.whether
                 this.picihaolistfun(row.id)
                 row.dotedittype = true
-                // 价格数量
+                // 积分数量
                 row.goodsNumtype = true
                 row.pricetype = true
                 // 编辑和保存状态切换
@@ -1730,14 +1731,16 @@ export default {
                 background: 'rgba(255,255,255,0.7)'
             })
             getDetails({ id: id }).then(res => {
+                res.data.data.orderItemsList.forEach((items) => {
+                    if (!items.subTotalMoney) {
+                        items.subTotalMoney = Number(items.goodsNum * items.price) ? Number(items.goodsNum * items.price).toFixed(2) : 0
+                    }
+                })
                 this.form = res.data.data
                 let ordForm = { srcBillNo: this.form.ordNo }
                 let _this = this
 
                 this.dataList = res.data.data.paymentRecordsList ? res.data.data.paymentRecordsList : [];
-                this.$nextTick(() => {
-                    this.$refs.formContacts.doLayout()
-                })
                 // getList(1, 50, ordForm).then((res) => {
                 //     this.dataList = res.data.data.records ? res.data.data.records : [];
                 //     this.$nextTick(() => {
@@ -1818,70 +1821,8 @@ export default {
                         }
                     }
                 })
-
-
-
-                this.form.orderItemsList.forEach((items) => {
-                    if (!items.subTotalMoney) {
-                        items.subTotalMoney = Number(items.goodsNum * items.price) ? Number(items.goodsNum * items.price).toFixed(2) : 0
-                        items.grossProfit = items.subTotalMoney - items.costprie
-                    }
-                    // let brandName = items.brandId
-                    // items.brandId = items.brandName
-                    // items.brandName = brandName
-
-                    // let goodsName = items.goodsId
-                    // items.goodsId = items.goodsName
-                    // items.goodsName = goodsName
-
-                })
+                this.$refs.formContacts.refreshTable()
                 loading.close();
-
-                // if (this.form.businessSource == "外部销售") {
-                //     console.log('外部销售');
-                //     this.optionForm.column.forEach(its => {
-                //         if (its.prop == 'customerId') {
-                //             this.$set(its, 'disabled', true)
-                //         }
-                //     })
-                //     //不能录入不能删除
-                //     this.$set(this.optionContactsBack, "addBtn", false)
-                //     this.isDisabled = true
-                //     this.$set(this.form, 'shipType', '物流')
-                //     this.$set(this.form, 'receivableType', '网络支付')
-                //     this.optionContactsBack.column.forEach(item => {
-                //         this.$set(item, 'disabled', true)
-                //         if (item.label == '批次号' || item.label == '备注') {
-                //             item.disabled = false
-                //         }
-                //     })
-                //     this['optionContacts'] = this['optionContactsBack'];
-                //     this.delColumnData(this.getColumnName(425), this['optionContactsBack']);
-                //     this.optionContactsBack.column.forEach(item => {
-                //         if (item.prop == 'dot') {
-                //             this.$set(item, disabled, false)
-                //         } else {
-                //             this.$set(item, disabled, true)
-                //         }
-                //     })
-
-                // } else {
-                //     this.$set(this.form, 'shipType', '物流')
-                //     this.$set(this.form, 'receivableType', '现金')
-                //     this.optionContactsBack.column.forEach(item => {
-                //         this.$set(item, 'disabled', false)
-                //     })
-                //     this.optionContactsBack.column.forEach(item => {
-                //         if (item.label === '规格型号' || item.label === '规格' || item.label === '品牌' || item.label === '物料编码' || item.label === '单位' || item.label === '商品描述') {
-                //             item.disabled = true;
-                //         }
-                //     })
-                //     console.log(324324);
-                //     this['optionContacts'] = this['optionContactsBack'];
-                //     this.delColumnData(this.getColumnName(425), this['optionContactsBack']);
-                // }
-                // // this.$set(this.form.orderItemsList,'goodsNum',66)
-
             }).catch(() => {
                 loading.close();
             })

+ 577 - 582
src/views/tirePartsMall/pointsMall/pointsOrder/index.vue

@@ -1,622 +1,617 @@
 <template>
-    <div>
-      <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', 424)"
-          @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 424)" :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>
+  <div>
+    <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', 424)"
+        @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 424)" :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>
-          </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="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>
-          </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>
+        <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>
-          </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>
-  
-  <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 {
-        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,
-            },
-            {
-              label: '价格',
-              prop: 'price',
-              overHidden: true,
-              width: 100,
-            },
-            {
-              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
-            },
-            // {
-            //   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,
+          </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>
+
+<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 {
+      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: "srcOrdNo",
-            search: true,
+            label: '数量',
+            prop: 'goodsNum',
             overHidden: true,
+            width: 100,
           },
           {
-            label: '显示已完成',
-            prop: 'notComplete',
+            label: '价格',
+            prop: 'price',
             overHidden: true,
-            hide: true,
-            search: true,
-            searchslot: true
+            width: 100,
           },
           {
-            label: "业务来源",
-            prop: "businessSource",
-            overHidden: true,
-            search: true,
-            type: 'select',
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=business_Source",
+            label: '批次号',
+            prop: 'dot',
+            type: "select",
+            disabled: true,
+            allowCreate: true,
+            filterable: true,
+            width: 150,
+            dicData: [],
             props: {
-              label: "dictValue",
-              value: "dictKey"
-            }
+              label: "dot",
+              value: "dot"
+            },
+            dicUrl: "/api/blade-sales-part/stockDesc/dotList",
+            overHidden: true,
           }, {
-            label: '所属公司',
-            prop: "salesCompanyName",
+            label: '商品编码',
+            prop: 'goodsNo',
             overHidden: true,
+            width: 150
           },
+          // {
+          //   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: "customerName",
-            search: true,
-            remote: true,
+            label: '品牌',
+            prop: 'brandName',
             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}}',
+            disabled: false,
+            width: 150
           },
           {
-            label: '业务员',
+            label: '规格型号',
+            prop: 'propertyName',
+            overHidden: true,
             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"
-            }]
-          }, 
+            width: 150
+          },
           {
-            label: '行数',
-            prop: "numberRows",
+            label: '规格',
+            prop: 'pattern',
             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: "status",
-            search: true,
-            overHidden: true,
-            type: 'select',
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=sales_Status",
-            props: {
-              label: "dictValue",
-              value: "dictKey"
-            },
-          }, 
+            disabled: false,
+            width: 150
+          },
           {
-            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: "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",
+            label: '发货数量',
+            prop: 'sendNum',
+            disabled: false,
             overHidden: true,
             width: 100,
-            searchRange: true,
-            searchDefaultTime: ["00:00:00", "23:59:59"],
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd HH:mm:ss"
           }]
-        }
-      }
-    },
-    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(424), 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("points_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
-      });
-    },
-    methods: {
-      // 导出
-      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]
-              }
-            }
+      },
+      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: 18,
+        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"
           }
-        }
-        console.log(config, 427)
-        config.params.bsType = 'JF'
-        const routeData = this.$router.resolve({
-          path: '/api/blade-sales-part/order/listExport',      //跳转目标下载地址
-          query: {
-            ...config.params    //括号内是要传递给新窗口的参数
+        }, {
+          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: "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: "status",
+          search: true,
+          overHidden: true,
+          type: 'select',
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=sales_Status",
+          props: {
+            label: "dictValue",
+            value: "dictKey"
+          },
+        },
+        {
+          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: "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'
           }
-        })
-        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/pointsMall/pointsOrder/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);
+        }, {
+          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"
+        }]
+      }
+    }
+  },
+  activated() {
+    setTimeout(() => {
+      console.log(this.$route.query, 400)
+      // 主页快捷跳转来的 直接打开新建订单
+      if (this.$route.query.showTrue) {
         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;
-            })
-            .finally(() => {
-              this.dataList[row.$index].itemLoading = false;
-            });
+      }
+      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(424), 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("points_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
+    });
+  },
+  methods: {
+    // 导出
+    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]
+            }
+          }
         }
-      },
-      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)
+      }
+      console.log(config, 427)
+      config.params.bsType = 'JF'
+      const routeData = this.$router.resolve({
+        path: '/api/blade-sales-part/order/listExport',      //跳转目标下载地址
+        query: {
+          ...config.params    //括号内是要传递给新窗口的参数
         }
-        this.loading = true
-        this.dataList.forEach(item => {
-          this.$refs.crud.toggleRowExpansion(item, false);
+      })
+      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/pointsMall/pointsOrder/index"
         });
-        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.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;
           })
-          this.loading = false
-        }).finally(() => {
-          this.loading = false
+          .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)
         })
-      },
-      //自定义列保存
-      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;
+      }).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>
-  
-  <style scoped>
-  .itemTable ::v-deep .el-table {
-    margin-left: 50px;
-    width: 100%;
-  }
-  
-  .bottomBox {
-    padding: 3px 6px;
-    border-radius: 12px;
-    color: #fff;
-    font-size: 10px;
-  }
-  
-  /deep/ .el-col-md-8 {
-    width: 24.33333%;
-  }
-  </style>
-  
+}
+</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;
+}
+
+/deep/ .el-col-md-8 {
+  width: 24.33333%;
+}
+</style>