修改 采购入库 联调 消费记录 共享销售部分接口

src/api/tirePartsMall/basicData/customerInformation/limitrecord.js

@@ -39,3 +39,10 @@ export const limitrecordSubmit = (row) => {
     data: row
   })
 }
+export const limitConsumptionRecord = (row) => {
+  return request({
+    url: '/api/blade-sales-part/order/limitConsumptionRecord',
+    method: 'get',
+    params: row
+  })
+}

src/api/tirePartsMall/basicData/shareSales.js

@@ -0,0 +1,370 @@
+import request from '@/router/axios';
+//查询列表
+export const getList = (params) => {
+    return request({
+        url: '/api/blade-sales-part/shareSales/list',
+        method: 'get',
+        params: params
+    })
+}
+//查询列表
+export const statisticsDetails = (params) => {
+    return request({
+        url: '/api/blade-sales-part/order/statisticsDetails',
+        method: 'get',
+        params: params
+    })
+}
+
+//删除
+export const remove = (data) => {
+    return request({
+        url: '/api/blade-sales-part/shareSales/remove',
+        method: 'post',
+        params: data
+    })
+}
+export const getDetails = (data) => {
+    return request({
+        url: '/api/blade-sales-part/shareSales/detail',
+        method: 'get',
+        params: data
+    })
+}
+export const submit = (data) => {
+    return request({
+        url: '/api/blade-sales-part/shareSales/submit',
+        method: 'POST',
+        data: data
+    })
+}
+export const generateShipTask = (data) => {
+    return request({
+        url: '/api/blade-sales-part/order/generateShipTask',
+        method: 'post',
+        data: data
+    })
+}
+export const revokeGenerateShipTask = (data) => {
+    return request({
+        url: '/api/blade-sales-part/order/revokeGenerateShipTask',
+        method: 'post',
+        data: data
+    })
+}
+
+export const tradingBox = (data) => {
+    return request({
+        url: '/api/blade-sales-part/shipItems/update',
+        method: 'post',
+        data: data
+    })
+}
+export const delOrderItem = (data) => {
+    return request({
+        url: '/api/blade-sales-part/orderItems/remove',
+        method: 'get',
+        params: data
+    })
+}
+//申请退款
+export const checkOrder = (data) => {
+    return request({
+        url: '/api/blade-sales-part/order/checkOrder',
+        method: 'post',
+        data: data
+    })
+}
+//确认退款
+export const confirmRefund = (data) => {
+    return request({
+        url: '/api/blade-sales-part/order/confirmRefund',
+        method: 'post',
+        data: data
+    })
+}
+//撤销请核
+export const revokeCheckOrder = (data) => {
+    return request({
+        url: '/api/blade-sales-part/order/revokeCheckOrder',
+        method: 'post',
+        data: data
+    })
+}
+
+export const goodsListXs = (customId, stock) => {
+    return request({
+        url: '/api/blade-sales-part/goodsDesc/goodsListXs',
+        method: 'get',
+        params: {
+            customId,
+            stock
+        }
+    })
+}
+// 销售订单添加轮胎列表
+export const goodsPageXs = (params) => {
+    return request({
+        url: '/api/blade-sales-part/shareputonshelves/listAll',
+        method: 'get',
+        params: params
+    })
+}
+// 销售订单添加轮胎列表
+export const goodsPagePoints = (params) => {
+    return request({
+        url: '/api/blade-sales-part/goodsDesc/goodsPagePoints',
+        method: 'get',
+        params: params
+    })
+}
+//采购订单保存
+export const inboundTask = (data) => {
+    return request({
+        url: '/api/blade-sales-part/order/inboundTask',
+        method: 'POST',
+        data: data
+    })
+}
+//请核
+export const checkOrderCG = (data) => {
+    return request({
+        url: '/api/blade-sales-part/order/checkOrderCG',
+        method: 'post',
+        data: data
+    })
+}
+//采购订单撤销请核
+export const revokeCheckOrderCG = (data) => {
+    return request({
+        url: '/api/blade-sales-part/order/revokeCheckOrderCG',
+        method: 'post',
+        data: data
+    })
+}
+//采购订单撤销任务
+export const revokeInboundTask = (data) => {
+    return request({
+        url: '/api/blade-sales-part/order/revokeInboundTask',
+        method: 'post',
+        data: data
+    })
+}
+//商品类别列表查询
+export const getGoodsInfo = (query) => {
+    return request({
+        url: ' /api/blade-purchase-sales/orderitems/orderItemsList',
+        method: 'get',
+        params: query
+    })
+}
+
+//查询轮胎列表
+export const goodsListAll = () => {
+    return request({
+        url: 'api/blade-sales-part/goodsDesc/goodsListAll?enableOrNot=1',
+        method: 'get',
+    })
+}
+///
+//查询客户
+export const getKh = () => {
+    return request({
+        url: '/api/blade-sales-part/corpsDesc/listAll?corpType=KH&enableOrNot=1',
+        method: 'get',
+    })
+}
+// 收款结算里的查询客户
+export const skgetKh = () => {
+    return request({
+        url: '/api/blade-sales-part/corpsDesc/listAll?cname=&corpType=KH&enableOrNot=1',
+        method: 'get',
+    })
+}
+// 采购入库里的业务对象
+export const corpsDescListAll = (data) => {
+    return request({
+        url: '/api/blade-sales-part/corpsDesc/listAll',
+        method: 'get',
+        params: data
+    })
+}
+//收款账户下拉
+export const getSk = () => {
+    return request({
+        url: '/api/blade-sales-part/accountManagement/list?enableOrNot=1&billType=HYCK',
+        method: 'get',
+    })
+}
+//所属公司下拉
+export const topList = () => {
+    return request({
+        url: '/api/blade-system/dept/top-list',
+        method: 'get'
+    })
+}
+//制单人下拉
+export const getZd = () => {
+    return request({
+        url: '/api/blade-user/page?size=20&current=1',
+        method: 'get'
+    })
+}
+// 调拨添加轮胎列表
+export const goodsPageDB = (params) => {
+    return request({
+        url: '/api/blade-sales-part/goodsDesc/goodsPageDB',
+        method: 'get',
+        params: params
+    })
+}
+// 一件入库
+export const shortcutWarehousing = (data) => {
+    return request({
+        url: '/api/blade-sales-part/order/shortcutWarehousing',
+        method: 'post',
+        data: data
+    })
+}
+// 盘点列表
+export const inventoryList = (params) => {
+    return request({
+        url: '/api/blade-sales-part/inventory/list',
+        method: 'get',
+        params: params
+    })
+}
+// 盘点保存
+export const submitInventory = (data) => {
+    return request({
+        url: '/api/blade-sales-part/inventory/submitInventory',
+        method: 'POST',
+        data: data
+    })
+}
+// 盘点保存
+export const confirmInventory = (data) => {
+    return request({
+        url: '/api/blade-sales-part/inventory/confirmInventory',
+        method: 'POST',
+        data: data
+    })
+}
+// 生成销售退货单
+export const generateReturns = (params) => {
+    return request({
+        url: '/api/blade-sales-part/returns/generateReturns',
+        method: 'get',
+        params: params
+    })
+}
+export const confirmWarehouse = (data) => {
+    return request({
+        url: '/api/blade-sales-part/order/confirmWarehouse',
+        method: 'POST',
+        data: data
+    })
+}
+export const revokeWarehouse = (data) => {
+    return request({
+        url: '/api/blade-sales-part/order/revokeWarehouse',
+        method: 'POST',
+        data: data
+    })
+}
+export const confirmRedeem = (data) => {
+    return request({
+        url: '/api/blade-sales-part/order/confirmRedeem',
+        method: 'POST',
+        data: data
+    })
+}
+export const revokeRedeem = (data) => {
+    return request({
+        url: '/api/blade-sales-part/order/revokeRedeem',
+        method: 'POST',
+        data: data
+    })
+}
+
+// 是否存在融资
+export const whetherExistenceFinancing = (data) => {
+    return request({
+        url: '/api/blade-sales-part/order/whetherExistenceFinancing',
+        method: 'POST',
+        data: data
+    })
+}
+
+// 出库任务审批
+export const checkOrderRW = (data) => {
+    return request({
+        url: '/api/blade-sales-part/order/checkOrderRW',
+        method: 'POST',
+        data: data
+    })
+}
+// 撤销出库任务审批
+export const revokeCheckOrderRW = (data) => {
+    return request({
+        url: '/api/blade-sales-part/order/revokeCheckOrderRW',
+        method: 'POST',
+        data: data
+    })
+}
+
+export const getParamservice = (current, size, params) => {
+    return request({
+        url: '/api/blade-system/paramservice/list',
+        method: 'get',
+        params: {
+            ...params,
+            current,
+            size,
+        }
+    })
+}
+// 
+export const getAdvancePaymentBalance = (params) => {
+    return request({
+        url: '/api/blade-sales-part/advancecharge/getAdvancePaymentBalance',
+        method: 'get',
+        params: params
+    })
+}
+
+export const getGoodAllList = (params) => {
+    return request({
+        url: '/api/blade-sales-part/goodsDesc/list',
+        method: 'get',
+        params: params
+    })
+}
+export const distributeShareSales = (data) => {
+    return request({
+        url: '/api/blade-sales-part/shareSales/distributeShareSales',
+        method: 'POST',
+        data: data
+    })
+}
+export const revokeDistributeShareSales = (params) => {
+    return request({
+        url: '/api/blade-sales-part/shareSales/revokeDistributeShareSales',
+        method: 'get',
+        params: params
+    })
+}
+export const confirmShipment = (data) => {
+    return request({
+        url: '/api/blade-sales-part/shareSales/confirmShipment',
+        method: 'POST',
+        data: data
+    })
+}
+export const revokeShipment = (data) => {
+    return request({
+        url: '/api/blade-sales-part/shareSales/revokeShipment',
+        method: 'POST',
+        data: data
+    })
+}

src/components/dicSelect/main.vue

@@ -311,7 +311,6 @@ export default {
             this.selectionList = []
         },
         remoteMethod(query) {
-            console.log(query)
             if (query !== '') {
                 setTimeout(() => {
                     this.data[this.dataName] = query
@@ -337,7 +336,6 @@ export default {
                     this.loading = false;
                 })
             } else {
-                console.log(this.mockData)
                 this.options = this.mockData
             }
 
@@ -356,7 +354,6 @@ export default {
         },
         selectChange(row) {
             this.options.forEach(e => {
-                console.log(row, e)
                 if (this.keyValue) {
                     if (row == e[this.keyValue]) {
                         this.$emit('selectChange', e)

src/views/tirePartsMall/basicData/customerInformation/components/limitrecord.vue

@@ -24,13 +24,12 @@
         </avue-crud>
       </el-tab-pane>
       <el-tab-pane label="消费记录" name="XFJL">
-        <avue-crud :option="option2" :table-loading="loading" :data="data" :page.sync="page"
-          :permission="permissionList" :before-open="beforeOpen" v-model="form" ref="crud" @row-update="rowUpdate"
-          @row-save="rowSave" @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
-          @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
-          @refresh-change="refreshChange" @on-load="onLoad"
+        <avue-crud :option="option2" :table-loading="loading2" :data="data2" v-model="form" ref="crud"
           @resetColumn="resetColumnTwo('crud', 'option2', 'optionList2', 436)"
           @saveColumn="saveColumnTwo('crud', 'option2', 'optionList2', 436)">
+          <template slot="ordNo" slot-scope="{ row }">
+            <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{ row.ordNo }}</span>
+          </template>
         </avue-crud>
       </el-tab-pane>
     </el-tabs>
@@ -38,7 +37,7 @@
 </template>
 
 <script>
-import { limitrecordList, limitrecordDetail, limitrecordSubmit, limitrecordRemove } from "@/api/tirePartsMall/basicData/customerInformation/limitrecord";
+import { limitrecordList, limitrecordDetail, limitrecordSubmit, limitrecordRemove, limitConsumptionRecord } from "@/api/tirePartsMall/basicData/customerInformation/limitrecord";
 import { mapGetters } from "vuex";
 import { regularBurdenfloating, regularInteger } from "@/util/regularJudgment";
 import { Header } from "element-ui";
@@ -103,8 +102,7 @@ export default {
       selectionList: [],
       option: {},
       optionList: {
-        height: 'auto',
-        maxHeight: '200',
+        height: '300',
         calcHeight: 30,
         tip: false,
         searchShow: true,
@@ -151,35 +149,34 @@ export default {
       },
       option2: {},
       optionList2: {
-        height: 'auto',
-        maxHeight: '200',
+        height: '300',
         calcHeight: 30,
         tip: false,
         border: true,
         index: true,
         menu: false,
-        header: false,
+        addBtn: false,
+        refreshBtn: false,
+        align: 'center',
+        // header: false,
         column: [
           {
             label: "业务编号",
-            prop: "amountOld",
-          },
-          {
-            label: "业务类型",
-            prop: "amountUpdate",
+            prop: "ordNo",
           },
           {
             label: "业务时间",
-            prop: "amountNew",
+            prop: "date",
           },
           {
             label: "消费额度",
-            prop: "remarks",
+            prop: "amount",
           },
         ]
       },
       data: [],
-      data2: []
+      data2: [],
+      loading2: false,
     };
   },
   props: {
@@ -213,9 +210,23 @@ export default {
   async created() {
     this.option = await this.getColumnData(this.getColumnName(340), this.optionList);
     this.option2 = await this.getColumnData(this.getColumnName(436), this.optionList);
-    // this.$set(this.formEidtData,'amountOld',this.amountOld?this.amountOld:0)
+    this.loading2 = true
+    limitConsumptionRecord({ customerId: this.pid }).then(res => {
+      this.data2 = res.data.data;
+    }).finally(() => {
+      this.loading2 = false
+    })
   },
   methods: {
+    rowEdit(row) {
+      this.$router.push({
+        path: "/tirePartsMall/salesManagement/saleOrder/index",
+        query: {
+          jumpId: row.ordId
+        }
+      })
+      this.$emit('closefun')
+    },
     // tabs 切换
     handleClick() {
       if (this.tabData == 'LSJL') {

src/views/tirePartsMall/basicData/customerInformation/detailsPage.vue

@@ -136,9 +136,8 @@
         <el-button type="primary" @click="confirmSynchronizationThree">确 定</el-button>
       </span>
     </el-dialog>
-
     <el-dialog title="额度修改记录" :visible.sync="dialogVisibleED" append-to-body width="60%">
-      <limitrecord ref="limitrecord" :amountOld="form.limitAmount" :pid="form.id"></limitrecord>
+      <limitrecord ref="limitrecord" :amountOld="form.limitAmount" :pid="form.id" @closefun="cancellationEDfun"></limitrecord>
       <span slot="footer" class="dialog-footer">
         <el-button @click="cancellationEDfun">取 消</el-button>
         <el-button type="primary" @click="limitrecordSubmitfun">确 定</el-button>

src/views/tirePartsMall/basicData/shareListing/index.vue

@@ -52,16 +52,16 @@
                 按编码导入
               </el-button> -->
               <el-button class="el-icon-document-copy" :disabled="selectionList.length === 0" type="primary"
-                v-if="search.billType == 0" size="small" @click="change(row, '1')">批量确认共享
+                 size="small" @click="change(row, '1')">批量确认共享
               </el-button>
               <el-button class="el-icon-document-copy" :disabled="selectionList.length === 0" type="danger" size="small"
-                v-if="search.billType == 0" @click="change(row, '2')">批量撤销共享
+                 @click="change(row, '2')">批量撤销共享
               </el-button>
               <el-button class="el-icon-document-copy" :disabled="selectionList.length === 0" type="primary"
-                v-if="search.billType == 1" size="small" @click="change(row, '3')">批量共享确认
+                 size="small" @click="change(row, '3')">批量共享确认
               </el-button>
               <el-button class="el-icon-document-copy" :disabled="selectionList.length === 0" type="danger"
-                v-if="search.billType == 1" size="small" @click="change(row, '4')">批量共享撤销
+                 size="small" @click="change(row, '4')">批量共享撤销
               </el-button>
             </template>
           </avue-crud>

src/views/tirePartsMall/basicData/sharedSales/index.vue

@@ -1,49 +1,16 @@
 <template>
   <div>
     <basic-container v-show="!detailsOpen">
-      <avue-crud :option="option" :search.sync="search" v-model="form" :table-loading="loading" :data="dataList"
+      <avue-crud :option="option" :search.sync="search" :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', 433)"
         @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 433)" :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>
@@ -52,21 +19,20 @@
           <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 slot="notCompleteSearch">
+          <el-checkbox v-model="search.notComplete" true-label="1"></el-checkbox>
         </template>
       </avue-crud>
     </basic-container>
-    <detailsPage v-if="detailsOpen" @goBack="goBack" :onLoad="form" :detailData="detailData" @backToList="backToList">
+    <detailsPage v-if="detailsOpen" @goBack="goBack" :detailData="detailData">
     </detailsPage>
   </div>
 </template>
 
 <script>
-import { getList, remove, getGoodsInfo } from "@/api/tirePartsMall/salesManagement/saleOrder";
+import { getList, remove} from "@/api/tirePartsMall/basicData/shareSales";
 import detailsPage from "./detailsPage"
-import { getDetails } from "@/api/tirePartsMall/salesManagement/saleOrder";
+import { getDetails } from "@/api/tirePartsMall/basicData/shareSales";
 import { getToken } from "@/util/auth";
 
 export default {
@@ -82,7 +48,6 @@ export default {
       returnStatusList: [],
       loading: false,
       search: {},
-      form: {},
       dataList: [],
       detailData: {},
       page: {
@@ -92,97 +57,6 @@ export default {
         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,
@@ -200,8 +74,6 @@ export default {
         searchSpan: 6,
         searchMenuSpan: 24,
         searchIcon: true,
-        expand: true,
-        expandWidth: 60,
         searchIndex: 3,
         highlightCurrentRow: true,
         dialogWidth: "70%",
@@ -475,28 +347,6 @@ export default {
   },
   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() {
@@ -506,21 +356,6 @@ export default {
     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
-    });
   },
   methods: {
     // 导出
@@ -550,62 +385,41 @@ export default {
       window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
     },
     check(row) {
-      this.form = row
       this.detailsOpen = true
     },
-    backToList(type) {
+    goBack(type) {
       if (JSON.stringify(this.$route.query) != "{}") {
         this.$router.$avueRouter.closeTag();
         this.$router.push({
           path: "/tirePartsMall/salesManagement/saleOrder/index"
         });
       }
-      this.form = {}
+      this.detailData = {}
       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;
-          })
-          .finally(() => {
-            this.dataList[row.$index].itemLoading = false;
-          });
-      }
-    },
-    rowDel(form, index) {
+    rowDel(row, index) {
       this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        remove({ id: form.id }).then(res => {
+        remove({ ids: row.id }).then(res => {
           this.$message({
             type: 'success',
             message: '删除成功!'
           });
-          this.dataList.splice(index, 1);
           this.onLoad(this.page)
         })
       }).catch(() => {
@@ -613,7 +427,6 @@ export default {
     },
     searchChange(params, done) {
       this.page.currentPage = 1
-      params.notComplete = 1
       this.onLoad(this.page, params)
       done();
     },
@@ -630,14 +443,8 @@ export default {
         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()

src/views/tirePartsMall/financialManagement/collectionSettlement/index.vue

@@ -50,7 +50,7 @@ export default {
       dataList: [],
       detailData: {},
       page: {
-        pageSize: 20,
+        pageSize: 10,
         currentPage: 1,
         total: 0,
         pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
@@ -348,7 +348,6 @@ export default {
       getList(params).then(res => {
         this.dataList = res.data.data.records
         this.page.total = res.data.data.total
-        this.loading = false
       }).finally(() => {
         this.loading = false
       })

src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/index.vue

@@ -397,6 +397,9 @@ export default {
   methods: {
     rowClick(row, type) {
       if (type == 1) {
+        if (row.statusName != '已入库') {
+          return this.$message.error("请先入库");
+        }
         this.$confirm('是否确认到货?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',