修改bug

src/components/bill/config/mainLists.json

@@ -70,7 +70,7 @@
       "index": 7
     },
     {
-      "label": "账单日期",
+      "label": "业务日期",
       "prop": "createTime",
       "searchProp":"createTimeList",
       "type": "date",

src/page/index/tags.vue

@@ -306,6 +306,10 @@ export default {
         if (tag.label == "销售订单(N)") {
           this.$store.commit("DOMXS_OUT_DETAIL");
         }
+        console.log(tag.label);
+        if(tag.label == "库存账明细"){
+          this.$store.commit("DOMAS_OUT_DETAIL");
+        }
         if (tag.label == "代理订单(N)") {
           this.$store.commit("DOMXS_OUT_DETAIL");
         }

src/router/views/index.js

@@ -2030,6 +2030,18 @@ export default [{
     component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/inventory/index')
   }]
 }, {
+  path: '/tirePartsMall/inventory/detail',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/tirePartsMall/inventory/detail',
+    name: '库存账明细',
+    meta: {
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/inventory/detail')
+  }]
+},{
   path: '/statisticAnalysis/AmtAmount/index',
   component: Layout,
   hidden: true,

src/store/getters.js

@@ -39,6 +39,7 @@ const getters = {
   mainItemStatus: state => state.ifdetail.mainItemStatus,
   settleStatus: state => state.ifdetail.settleStatus,
   domSaleStatus: state => state.ifdetail.domSaleStatus,
+  inventoryAccount:state => state.ifdetail.inventoryAccount,
   domStockDetail: state => state.ifdetail.domStockDetail,
   domPurStatus: state => state.ifdetail.domPurStatus,
   purchaseStatus: state => state.ifdetail.purchaseStatus,

src/store/modules/ifdetail.js

@@ -12,6 +12,7 @@ const ifdetail = {
     mainItemStatus: false, //主营业务明细
     settleStatus: false, //结算明细
     domSaleStatus: false, // 内贸销售
+    inventoryAccount:false,//库存账明细
     domPurchaseOrder: false,
     domStockDetail: false, // 国内库存账
     domPurStatus: false, // 内贸采购
@@ -225,6 +226,14 @@ const ifdetail = {
     DOMXS_OUT_DETAIL(state) {
       state.domSaleStatus = false;
     },
+    //打开库存账明细
+    DOMAS_IN_DETAIL(state) {
+      state.inventoryAccount = true;
+    },
+    //关闭库存账明细
+    DOMAS_OUT_DETAIL(state) {
+      state.inventoryAccount = false;
+    },
     DOMKC_IN_DETAIL(state) {
       state.domStockDetail = true;
     },
@@ -237,7 +246,6 @@ const ifdetail = {
     },
     DEMKC_OUT_DETAIL(state) {
       state.domStockDetail = false;
-
     },
     DOMCG_IN_DETAIL(state) {
       state.domPurStatus = true;
@@ -376,6 +384,10 @@ const ifdetail = {
       if (tag.label == '销售订单(N)') {
         state.domSaleStatus = true
       }
+      console.log('打开库存账明细');
+      if (tag.label == '库存账明细') {
+        state.inventoryAccount = true
+      }
       if (tag.label == '采购订单(N)') {
         state.domPurStatus = true
       }

src/views/InventoryManagement/inventoryAccount/index.vue

@@ -203,6 +203,14 @@ export default {
           overHidden: true,
           search: true
         },{
+          label: "入库日期",
+          prop: "stockDate",
+          type: "date",
+          value: dateFormat(new Date(),'yyyy-MM-dd'),
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd",
+          width: 100
+        },{
           label: "出库日期",
           prop: "deliveryDate",
           type: "date",

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -271,7 +271,7 @@
       <bill-application :billId="form.id" @choceApplication="choceApplication">
       </bill-application>
     </el-dialog>
-    <report-dialog :switchDialog="switchDialog" :reportId="form.id" reportName="发货通知单"
+    <report-dialog :switchDialog="switchDialog" :reportId="form.id" reportName="国内贸易-采购单"
       @onClose="onClose()"></report-dialog>
     <el-dialog append-to-body title="审批" class="el-dialogDeep" :visible.sync="checkDialog" width="50%"
       :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>

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

@@ -272,7 +272,6 @@ export default {
     corpType
   },
   activated() {
-    console.log(1);
     setTimeout(() => {
         this.$nextTick(() => {
           this.$refs.crud.doLayout()
@@ -517,9 +516,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.page-crad ::v-deep .basic-container__card {
-  height: 94.2vh;
-}
+// .page-crad ::v-deep .basic-container__card {
+//   height: 94.2vh;
+// }
 
 ::v-deep .el-form-item__error {
   display: none !important;

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

@@ -7,13 +7,14 @@
         </el-button>
       </div>
       <div class="add-customer-btn">
-               <el-button class="el-button&#45;&#45;small-yh" style="margin-right: 10px" type="primary" size="small" v-if="!editButton"
-                          @click="confirmEditing">编辑
-               </el-button>
-        <el-button class="el-button--small-yh" type="primary" size="small" :disabled="form.financeStatus == '已收款' || isSaveBtn"
-          @click="editCustomer">保存数据
+        <el-button class="el-button&#45;&#45;small-yh" style="margin-right: 10px" type="primary" size="small"
+          v-if="!editButton" @click="confirmEditing">编辑
         </el-button>
-        <el-button class="el-button--small-yh" type="warning" :disabled="isFinanceBtn"  size="small" @click="collection">{{ form.financeStatus ==
+        <el-button class="el-button--small-yh" type="primary" size="small"
+          :disabled="form.financeStatus == '已收款' || isSaveBtn" @click="editCustomer">保存数据
+        </el-button>
+        <el-button class="el-button--small-yh" type="warning" :disabled="isFinanceBtn" size="small" @click="collection">{{
+          form.financeStatus ==
           '已收款' ? '撤销收款' : '收款' }}
         </el-button>
         <!-- <el-button class="el-button--small-yh" type="primary" size="small" v-if="form.id">启用
@@ -33,6 +34,10 @@
             <el-button type="primary" icon="el-icon-plus" :disabled="form.financeStatus == '已收款' || isMenu" size="small"
               @click="rowAdd()">选择订单</el-button>
           </template>
+          <template slot-scope="{ row, index }" slot="contractNumber">
+            <span style="color: #409EFF;cursor: pointer" @click.stop="viewDocuments(row)">{{ row.contractNumber }}
+            </span>
+          </template>
           <template slot-scope="{type,size,row,index,disabled}" slot="menu">
             <el-button :size="size" :disabled="form.financeStatus == '已收款' || isMenu" :type="type"
               :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'" @click="$refs.formContacts.rowCell(row, index)">{{
@@ -68,10 +73,10 @@ export default {
   data() {
     return {
       disabled: false,
-      editButton:false,
+      editButton: false,
       isSaveBtn: false,
       isFinanceBtn: false,
-      isMenu:false,
+      isMenu: false,
       billDetailDialog: false,
       params: {},
       form: {
@@ -144,7 +149,7 @@ export default {
             message: " ",
             trigger: "blur"
           }],
-          value:'青岛'
+          value: '青岛'
         }, {
           label: '收款日期',
           prop: "settlementDate",
@@ -315,14 +320,14 @@ export default {
       })
       detail({ id: id }).then(res => {
         this.form = res.data.data
-        if (res.data.data.financeStatus == '已收款') {
-          console.log('已收款');
-          this.$set(this.optionForm, 'disabled', true)
-          this.$set(this.optionContactsBack, 'disabled', true)
-        } else {
-          this.$set(this.optionForm, 'disabled', false)
+        // if (res.data.data.financeStatus == '已收款') {
+        //   console.log('已收款');
+        //   this.$set(this.optionForm, 'disabled', true)
+        //   this.$set(this.optionContactsBack, 'disabled', true)
+        // } else {
+        //   this.$set(this.optionForm, 'disabled', false)
+        // }
 
-        }
         loading.close();
       }).catch(() => {
         loading.close();
@@ -382,7 +387,7 @@ export default {
             ...this.form,
             dc: 'd',
             billType: 'SK',
-            corpName:this.form.$corpId
+            corpName: this.form.$corpId
           }
           const loading = this.$loading({
             lock: true,
@@ -426,6 +431,8 @@ export default {
               }
               collectionAndPayment(data).then((res => {
                 this.refresh(res.data.data.id)
+                this.$set(this.optionForm, 'disabled', true)
+                this.$set(this.optionContactsBack, 'disabled', true)
                 this.$message.success('收款成功')
                 loading.close()
               }))
@@ -472,6 +479,15 @@ export default {
         this.isMenu = false
       }
     },
+    //查看单据
+    viewDocuments(row) {
+      console.log(row);
+      this.$router.$avueRouter.closeTag('/tirePartsMall/salesManagement/saleOrder/index');
+      this.$router.push({
+        path: "/tirePartsMall/salesManagement/saleOrder/index",
+        query: { detail:row,type:'S'},
+      });
+    },
     //关闭
     closeBillDetail() {
       this.billDetailDialog = false;

src/views/tirePartsMall/financialManagement/paymentSettlement/detailsPage.vue

@@ -34,6 +34,10 @@
             <el-button type="primary" icon="el-icon-plus" :disabled="form.financeStatus == '已付款' || isMenu" size="small"
               @click="rowAdd()">选择订单</el-button>
           </template>
+          <template slot-scope="{ row, index }" slot="contractNumber">
+          <span style="color: #409EFF;cursor: pointer" @click.stop="payBtn(row)">{{ row.contractNumber }}
+          </span>
+        </template>
           <template slot-scope="{type,size,row,index,disabled}" slot="menu">
             <el-button :size="size" :type="type" :disabled="form.financeStatus == '已付款' || isMenu"
               :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'" @click="$refs.formContacts.rowCell(row, index)">{{
@@ -386,6 +390,8 @@ export default {
                 .then((res) => {
                   console.log(res);
                   this.refresh(res.data.data.id);
+                  this.$set(this.optionForm, 'disabled', true)
+                  this.$set(this.optionContactsBack, 'disabled', true)
                   this.$message.success('付款成功');
                   loading.close();
                 })
@@ -420,7 +426,14 @@ export default {
           }
         }
       })
-
+    },
+    payBtn(row){
+      console.log(row);
+      this.$router.$avueRouter.closeTag('/tirePartsMall/salesManagement/purchaseOrder/index');
+      this.$router.push({
+        path: "/tirePartsMall/salesManagement/purchaseOrder/index",
+        query: { detail:row,type:'F'},
+      });
     },
     rowSave(form, done, loading) {
       done(form)

src/views/tirePartsMall/inventory/config/detail.json

@@ -0,0 +1,99 @@
+{
+    "searchShow": true,
+    "searchMenuSpan": 8,
+    "border": true,
+    "index": true,
+    "viewBtn": false,
+    "editBtn": false,
+    "delBtn": false,
+    "addBtn": false,
+    "align": "center",
+    "menuWidth": "120",
+    "menu": false,
+    "showSummary": true,
+    "searchIcon": true,
+    "searchIndex": 2,
+    "selection": true,
+    "tip": false,
+    "expand": false,
+    "expandWidth": 38,
+    "sumColumnList": [
+        {
+            "name": "addQuantity",
+            "type": "sum"
+        },
+        {
+            "name": "subQuantity",
+            "type": "sum"
+        },
+        {
+            "name": "totalQuantity",
+            "type": "sum"
+        }
+    ],
+    "column": [
+        {
+            "label": "业务编号",
+            "prop": "sysNo",
+            "search": false,
+            "index": 1,
+            "minWidth": 80,
+            "overHidden": true,
+            "searchSpan": 8
+        },
+        {
+            "label": "业务日期",
+            "prop": "businessDate",
+            "search": false,
+            "index": 2,
+            "minWidth": 80,
+            "overHidden": true,
+            "searchSpan": 8
+        },
+        {
+            "label": "名称",
+            "prop": "goodsName",
+            "search": false,
+            "index": 3,
+            "minWidth": 80,
+            "overHidden": true,
+            "searchSpan": 8
+        },
+        {
+            "label": "类型",
+            "prop": "orderType",
+            "index": 4,
+            "minWidth": 80,
+            "overHidden": true
+        },
+        {
+            "label": "增加",
+            "prop": "addQuantity",
+            "index": 4,
+            "minWidth": 80,
+            "overHidden": true
+        },
+        {
+            "label": "减少",
+            "prop": "subQuantity",
+            "index": 4,
+            "minWidth": 80,
+            "overHidden": true
+        },
+        {
+            "label": "结余",
+            "prop": "totalQuantity",
+            "index": 4,
+            "hide":true,
+            "minWidth": 80,
+            "overHidden": true
+        },
+        {
+            "label": "状态",
+            "prop": "status",
+            "index": 4,
+            "minWidth": 80,
+            "overHidden": true
+        }
+    ]
+}

src/views/tirePartsMall/inventory/detail.vue

@@ -0,0 +1,149 @@
+<template>
+    <basic-container>
+      <avue-crud
+        ref="crud"
+        :data="dataList"
+        :option="option"
+        v-model="form"
+        :search.sync="search"
+        :table-loading="loading"
+        @saveColumn="saveColumn"
+        @resetColumn="resetColumn"
+        @search-change="searchChange"
+        @current-change="currentChange"
+        @size-change="sizeChange"
+        @refresh-change="refreshChange"
+        @on-load="onLoad"
+      >
+        <template slot="orderNo" slot-scope="{ row, index }">
+          <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(row, index)">{{ row.orderNo }}</span>
+        </template>
+      </avue-crud>
+    </basic-container>
+  </template>
+  
+  <script>
+  import option from "./config/detail.json";
+  import {selectStockInventory} from "@/api/basicData/inventoryAccount";
+  
+  export default {
+    name: "detail",
+    data() {
+      return {
+        option: {},
+        dataList: [],
+        form: {},
+        page: {
+          pageSize: 10,
+          pagerCount: 5,
+          total: 0,
+        },
+        search: {},
+        loading: false,
+        params: null,
+      }
+    },
+    async created() {
+      // this.option = option
+      console.log('打开了');
+      this.option = await this.getColumnData(this.getColumnName(67), option);
+      this.$store.commit("DOMAS_IN_DETAIL");
+    },
+    activated() {
+    this.$store.commit("DOMAS_IN_DETAIL");
+      this.params = {
+        goodsId: this.$route.query.goodsId,
+        stockId:this.$route.query.stockId
+      }
+      this.onLoad(this.page)
+    },
+    methods: {
+      onLoad(page, params) {
+        if (!this.params) return
+        params = {...params, ...this.params}
+        this.dataList.forEach(item => {
+          this.$refs.crud.toggleRowExpansion(item, false)
+        })
+        this.loading = true;
+        selectStockInventory(params)
+          .then(res => {
+            console.log('res',res);
+            this.dataList = res.data.data? res.data.data : [];
+            this.page.total = res.data.data.total;
+            if (this.page.total) {
+              this.option.height = window.innerHeight - 260;
+            }
+          })
+          .finally(() => {
+            this.loading = false;
+          });
+      },
+      searchChange(params, done) {
+        this.onLoad(this.page, params);
+        done();
+      },
+      currentChange(val) {
+        this.page.currentPage = val;
+      },
+      sizeChange(val) {
+        this.page.currentPage = 1;
+        this.page.pageSize = val;
+      },
+      refreshChange() {
+        this.dataList.forEach(item => {
+          this.$refs.crud.toggleRowExpansion(item, false)
+        })
+        this.page.currentPage = 1;
+        this.onLoad(this.page, this.search);
+      },
+      async saveColumn() {
+        const inSave = await this.saveColumnData(
+          this.getColumnName(67),
+          this.option
+        );
+        if (inSave) {
+          this.$message.success("保存成功");
+          //关闭窗口
+          this.$refs.crud.$refs.dialogColumn.columnBox = false;
+        }
+      },
+      async resetColumn() {
+        this.option = option;
+        const inSave = await this.delColumnData(
+          this.getColumnName(67),
+          option
+        );
+        if (inSave) {
+          this.$message.success("重置成功");
+          //关闭窗口
+          this.$refs.crud.$refs.dialogColumn.columnBox = false;
+        }
+      },
+      // 跳转
+      beforeOpenPage(row,index) {
+        if (this.$store.getters.domSaleStatus) {
+          this.$alert("销售单存在,请保存关闭销售单再进行操作", "温馨提示", {
+            confirmButtonText: "确定",
+            type: "warning",
+            callback: action => {
+              console.log(action);
+            }
+          });
+        } else {
+          this.$router.$avueRouter.closeTag("/businessManagement/salesOrder/index");
+          this.$router.push({
+            path: "/businessManagement/salesOrder/index",
+            query: {
+              id: row.id
+            },
+          });
+        }
+      },
+    },
+  }
+  </script>
+  
+  <style scoped>
+  
+  </style>
+  

src/views/tirePartsMall/inventory/index.vue

@@ -10,13 +10,16 @@
         <el-col :span="20">
           <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" @refresh-change="refreshChange"
-            :cell-style="cellStyle"
-            @search-criteria-switch="searchCriteriaSwitch"
+            :cell-style="cellStyle" @search-criteria-switch="searchCriteriaSwitch"
             @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 268)"
             @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 268)" :page.sync="page">
             <template slot-scope="{type,size,row,$index}" slot="menuLeft">
               <el-button type="warning" icon="el-icon-download" size="small" @click="outExport">导出</el-button>
             </template>
+            <template slot-scope="{ row }" slot="storeInventory">
+              <span style="color: #409EFF;cursor: pointer" @click.stop="storeInventoryOpen(row)">{{ row.storeInventory }}
+              </span>
+            </template>
           </avue-crud>
         </el-col>
       </el-row>
@@ -41,6 +44,10 @@ export default {
       form: {},
       dataList: [],
       detailData: {},
+      params: {
+        corpId: null,
+        itemId: null
+      },
       page: {
         pageSize: 20,
         currentPage: 1,
@@ -185,20 +192,21 @@ export default {
             overHidden: true,
             width: 100
           }, {
-            label: '存在库存',
+            label: '是否显示0库存',
             prop: "whether",
             overHidden: true,
             search: true,
-            type:'select',
-            showColumn:false,
-            hide:true,
-            width: 100,
+            type: 'select',
+            showColumn: false,
+            hide: true,
+            width: 120,
+            searchLabelWidth: 120,
             dicData: [{
               "label": "是",
-              "value": 1
+              "value": "1"
             }, {
               "label": "否",
-              "value": 0
+              "value": "0"
             }]
           }]
       }
@@ -290,12 +298,38 @@ export default {
         this.loading = false
       })
     },
-    searchCriteriaSwitch(){
+    searchCriteriaSwitch() {
       this.$refs.crud.getTableHeight();
     },
     cellStyle() {
       return "padding:0;height:40px;";
     },
+    //点击可用库存打开
+    storeInventoryOpen(row) {
+      console.log(this.$store.getters.inventoryAccount);
+      if (this.$store.getters.inventoryAccount) {
+        this.$alert("明细账已存在,请保存关闭明细账再进行操作", "温馨提示", {
+          confirmButtonText: "确定",
+          type: "warning",
+          callback: action => {
+            console.log(action);
+          }
+        });
+      } else {
+        this.params.corpId = row.corpId
+        this.params.itemId = row.goodsId
+        this.params.storageId = row.storageId
+        this.$router.$avueRouter.closeTag("/tirePartsMall/inventory/detail");
+        this.$router.push({
+          path: "/tirePartsMall/inventory/detail",
+          query: {
+            stockId: row.storageId,
+            goodsId: row.goodsId
+          },
+        });
+      }
+
+    },
     //自定义列保存
     async saveColumnTwo(ref, option, optionBack, code) {
       /**

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

@@ -7,11 +7,11 @@
                 </el-button>
             </div>
             <div class="add-customer-btn">
-                <el-button class="el-button&#45;&#45;small-yh" type="primary" size="small"
-                    v-if="form.id" @click="confirmEditing">编辑
+                <el-button class="el-button&#45;&#45;small-yh" type="primary" size="small" v-if="form.id"
+                    @click="confirmEditing">编辑
                 </el-button>
-                <el-button class="el-button--small-yh" type="primary" :disabled="isButton" size="small" v-if="form.statusName != '已入库'"
-                    @click="editCustomer">保存数据
+                <el-button class="el-button--small-yh" type="primary" :disabled="isButton" size="small"
+                    v-if="form.statusName != '已入库'" @click="editCustomer">保存数据
                 </el-button>
                 <el-button class="el-button--small-yh" type="success" size="small"
                     v-if="form.statusName == '待入库' || form.statusName == '已撤销'" @click="complete" :disabled="isButton">入库完成
@@ -66,7 +66,8 @@
                     </el-tab-pane>
                 </el-tabs>
             </trade-card>
-            <report-dialog :switchDialog="switchDialog"  :reportId="form.id" reportName="入库工单"  @onClose="onClose()"></report-dialog>
+            <report-dialog :switchDialog="switchDialog" :reportId="form.id" reportName="入库工单"
+                @onClose="onClose()"></report-dialog>
         </div>
         <el-dialog title="导入明细" append-to-body :visible.sync="excelBox" v-if="excelBox" width="555px"
             :close-on-click-modal="false" v-dialog-drag>
@@ -107,10 +108,10 @@ export default {
     data() {
         return {
             switchDialog: false,
-            isEdit:false,
-            values:'',
-            isEdits:false,
-            isButton:false,
+            isEdit: false,
+            values: '',
+            isEdits: false,
+            isButton: false,
             activeName: "sale_detail",
             disabled: false,
             isrowAdd: true,
@@ -279,12 +280,22 @@ export default {
                 border: true,
                 menuWidth: 120,
                 stripe: true,
-                span:8,
+                span: 8,
                 index: true,
                 menu: true,
                 dialogTop: 25,
                 disabled: false,
                 dialogWidth: "80%",
+                showSummary: true,
+                sumColumnList: [
+                    {
+                        name: 'sendNum',
+                        type: 'sum',
+                    },{
+                        name: 'goodsNum',
+                        type: 'sum',
+                    }
+                ],
                 column: [{
                     label: '轮胎名称',
                     prop: 'goodsId',
@@ -298,7 +309,7 @@ export default {
                         value: 'id'
                     },
                     dicUrl: '/api/blade-sales-part/goodsDesc/goodsListAll'
-                }, 
+                },
                 // {
                 //     label: "价格",
                 //     prop: "price",
@@ -408,7 +419,7 @@ export default {
                 }, {
                     label: "备注",
                     prop: "remarks",
-                    span:16,
+                    span: 16,
                     disabled: false,
                     overHidde: true
                 }]
@@ -450,31 +461,17 @@ export default {
                     //     overHidden: true
                     // },
                     {
-                        prop: "itemId",
                         label: "地址",
-                        type: "select",
-                        props: {
-                            label: "cname",
-                            value: "id"
-                        },
-                        dicData: [],
+                        prop: "recAddress",
                         overHidden: true,
-                        filterable: true,
-                        rules: [
-                            {
-                                required: true,
-                                message: "请选择",
-                                trigger: "blur"
-                            }
-                        ]
                     },
                     {
-                        prop: "length",
+                        prop: "contacts",
                         label: "联系人",
                         overHidden: true
                     },
                     {
-                        prop: "thickness",
+                        prop: "phone",
                         label: "电话",
                         overHidden: true
                     },
@@ -482,8 +479,7 @@ export default {
                         prop: "remarks",
                         label: "备注",
                         disabled: false,
-                        overHidden: true,
-                        cell: true
+                        overHidden: true
                     }
                 ]
             },
@@ -534,8 +530,8 @@ export default {
                 dotListAll({
                     storageId: this.form.storageId,
                     goodsId: this.formContacts.goodsId
-            }).then(res=>{this.formContacts.price = res.data.data[0].inventoryCostPrice,console.log(res)})
-                goodsDetail({ id: value,stock:this.form.storageId?this.form.storageId:'' }).then(res => {
+                }).then(res => { this.formContacts.price = res.data.data[0].inventoryCostPrice, console.log(res) })
+                goodsDetail({ id: value, stock: this.form.storageId ? this.form.storageId : '' }).then(res => {
                     console.log(this.form.storageId);
                     this.formContacts.goodsNo = res.data.data.code
                     this.formContacts.brandId = res.data.data.brandId
@@ -554,7 +550,7 @@ export default {
                             storageId: this.form.storageId,
                             goodsId: this.formContacts.goodsId
                         }).then(res => {
-                            console.log('dot',res);
+                            console.log('dot', res);
                             this.findObject(this.optionContacts.column, "dot").dicData = res.data.data
                         })
                     }
@@ -570,8 +566,8 @@ export default {
                 dotListAll({
                     storageId: this.form.storageId,
                     goodsId: this.formContacts.goodsId
-            }).then(res=>{ this.formContacts.price = res.data.data[0].inventoryCostPrice})
-                goodsDetail({ id: value,stock:this.form.storageId?this.form.storageId:''}).then(res => {
+                }).then(res => { this.formContacts.price = res.data.data[0].inventoryCostPrice })
+                goodsDetail({ id: value, stock: this.form.storageId ? this.form.storageId : '' }).then(res => {
                     this.formContacts.goodsNo = res.data.data.code
                     this.formContacts.brandId = res.data.data.brandId
                     this.formContacts.brandName = res.data.data.brandName
@@ -698,23 +694,23 @@ export default {
                     }
                 })
                 this.optionContacts.column.forEach(item => {
-                    if (item.prop == 'remarks'|| item.prop == 'dot' || item.prop == 'sendNum') {
+                    if (item.prop == 'remarks' || item.prop == 'dot' || item.prop == 'sendNum') {
                         this.$set(item, 'disabled', false)
                     } else {
                         this.$set(item, 'disabled', true)
                     }
                 })
-                if(this.form.billno.substring(0, 4) == 'TKSH'){
+                if (this.form.billno.substring(0, 4) == 'TKSH') {
                     // this.isEdit = true
                     this.isEdits = true
                     this.isrowAdd = true
                     this.optionContacts.column.forEach(item => {
-                    if (item.prop == 'remarks' || item.prop == 'sendNum' || item.prop == 'price'|| item.prop == 'dot') {
-                        this.$set(item, 'disabled', false)
-                    } else {
-                        this.$set(item, 'disabled', true)
-                    }
-                })
+                        if (item.prop == 'remarks' || item.prop == 'sendNum' || item.prop == 'price' || item.prop == 'dot') {
+                            this.$set(item, 'disabled', false)
+                        } else {
+                            this.$set(item, 'disabled', true)
+                        }
+                    })
                 }
             } else if (this.form.statusName == '已入库') {
                 this.$set(this.optionForm, 'disabled', false)
@@ -736,20 +732,20 @@ export default {
                 })
             }
             console.log(this.form.shipItemsList[0].goodsId);
-                goodsDetail({ id: this.form.shipItemsList[0].goodsId,stock:this.form.storageId?this.form.storageId:''}).then(res => {
-                    if (res.data.data.whether == 0) {
-                        this.findObject(this.optionContacts.column, "dot").disabled = true
-                    } else {
-                        this.findObject(this.optionContacts.column, "dot").disabled = false
-                        dotList({
-                            storageId: this.form.storageId,
-                            goodsId: this.formContacts.goodsId
-                        }).then(res => {
-                            console.log('567');
-                            this.findObject(this.optionContacts.column, "dot").dicData = res.data.data
-                        })
-                    }
-                })
+            goodsDetail({ id: this.form.shipItemsList[0].goodsId, stock: this.form.storageId ? this.form.storageId : '' }).then(res => {
+                if (res.data.data.whether == 0) {
+                    this.findObject(this.optionContacts.column, "dot").disabled = true
+                } else {
+                    this.findObject(this.optionContacts.column, "dot").disabled = false
+                    dotList({
+                        storageId: this.form.storageId,
+                        goodsId: this.formContacts.goodsId
+                    }).then(res => {
+                        console.log('567');
+                        this.findObject(this.optionContacts.column, "dot").dicData = res.data.data
+                    })
+                }
+            })
         },
         complete() {
             this.$refs["form"].validate((valid, done) => {
@@ -768,7 +764,7 @@ export default {
                         this.refresh(res.data.data.id)
                         this.$set(this.optionForm, 'disabled', true)
                         this.$set(this.optionContactsBack, 'disabled', true)
-                        this.isEdit =true
+                        this.isEdit = true
                         this.$message.success("保存成功");
                         loading.close();
                     }).finally(() => {

src/views/tirePartsMall/salesManagement/inboundTask/index.vue

@@ -80,8 +80,14 @@ export default {
         highlightCurrentRow: true,
         dialogWidth: "70%",
         summaryText: "合计",
-        // showSummary: true,
-        // sumColumnList: [],
+        showSummary: true,
+        sumColumnList: [ {
+            name: 'goodsTotalNum',
+            type: 'sum',
+          }, {
+            name: 'sendTotalNum',
+            type: 'sum',
+          },],
         column: [{
           label: '采购单号',
           prop: "ordNo",

src/views/tirePartsMall/salesManagement/outboundTask/index.vue

@@ -80,8 +80,14 @@ export default {
         highlightCurrentRow: true,
         dialogWidth: "70%",
         summaryText: "合计",
-        // showSummary: true,
-        // sumColumnList: [],
+        showSummary: true,
+        sumColumnList: [ {
+            name: 'goodsTotalNum',
+            type: 'sum',
+          }, {
+            name: 'sendTotalNum',
+            type: 'sum',
+          },],
         column: [{
           label: '销售单号',
           prop: "ordNo",

src/views/tirePartsMall/salesManagement/outboundWorkOrder/detailsPage.vue

@@ -215,6 +215,15 @@ export default {
         menuWidth: 140,
         dialogTop: 25,
         dialogWidth: "80%",
+        showSummary: true,
+        sumColumnList: [
+          {
+            name: 'goodsNum',
+            type: 'sum',
+          }, {
+            name: 'sendNum',
+            type: 'sum',
+          }],
         column: [{
           label: '轮胎名称',
           prop: 'goodsId',

src/views/tirePartsMall/salesManagement/outboundWorkOrder/index.vue

@@ -228,10 +228,20 @@ export default {
           label: '业务日期',
           prop: "createTime",
           overHidden: true,
+          searchProp: "createTimeList",
+          type: "date",
+          overHidden: true,
+          search: 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: "stockClerkId",
           type: 'select',
+          search:true,
           props: {
             label: 'realName',
             value: 'id'

src/views/tirePartsMall/salesManagement/purchaseOrder/detailsPage.vue

@@ -14,7 +14,7 @@
                     :disabled="isSaveBtn" @click="editCustomer">保 存
                 </el-button>
                 <el-button class="el-button--small-yh" style="margin-left: 6px;" :type="buttonColor" size="small"
-                    :disabled="isDisabledTask" @click="generateOutbound">
+                    :disabled="isDisabledTask || form.status !== '待确认'" @click="generateOutbound">
                     {{ buttonText }}
                 </el-button>
                 <el-dropdown style="padding: 0 6px;line-height: 0">
@@ -1094,29 +1094,29 @@ export default {
                     loading.close()
 
                 } else if (this.form.status == '待确认') {
-                    this.isSaveBtn = true;
-                    this.isDisabledTask = true;
-                    this.isAddBtn = true;
-                    this.isAdd = true;
-                    this.isDisabled =true
+                    this.isSaveBtn = false;
+                    this.isDisabledTask = false;
+                    this.isAddBtn = false;
+                    this.isAdd = false;
+                    this.isDisabled =false
                     this.viewDisabled = false;
                     // this.isDisabled = true
                     console.log('待确认');
-                    this.optionForm.column.forEach(item => {
-                        if (item.label === '仓库' || item.label === '备注' || item.label === '配送方式' || item.label === '物流公司') {
-                            this.$set(item, 'disabled', false)
-                        } else {
-                            this.$set(item, 'disabled', true)
-                        }
-                    })
-                    this.optionContactsBack.column.forEach(its => {
-                        if (its.prop == 'remarks' || its.prop == 'dot') {
-                            this.$set(its, 'disabled', false)
-                        } else {
-                            this.$set(its, 'disabled', true)
+                    // this.optionForm.column.forEach(item => {
+                    //     if (item.label === '仓库' || item.label === '备注' || item.label === '配送方式' || item.label === '物流公司') {
+                    //         this.$set(item, 'disabled', false)
+                    //     } else {
+                    //         this.$set(item, 'disabled', true)
+                    //     }
+                    // })
+                    // this.optionContactsBack.column.forEach(its => {
+                    //     if (its.prop == 'remarks' || its.prop == 'dot') {
+                    //         this.$set(its, 'disabled', false)
+                    //     } else {
+                    //         this.$set(its, 'disabled', true)
 
-                        }
-                    })
+                    //     }
+                    // })
                     loading.close()
                 }
                 if (this.form.status == '待发货') {

src/views/tirePartsMall/salesManagement/purchaseOrder/index.vue

@@ -292,6 +292,18 @@ export default {
           prop: "totalMoney",
           overHidden: true,
         }, {
+          label: '结算状态',
+          prop: "financeStatus",
+          search: true,
+          overHidden: true,
+          type: 'select',
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=settlement_Status",
+          props: {
+            label: "dictValue",
+            value: "dictKey"
+          }
+
+        },{
           label: '状态',
           prop: "status",
           search: true,
@@ -371,6 +383,9 @@ export default {
       if (this.$route.query.check) {
         this.editOpen({ id: this.$route.query.check.srcBillId }, 1)
         this.$store.commit("IN_LTCG_STATUS");
+      } 
+      if(this.$route.query.type == 'F'){
+        this.editOpen({ id: this.$route.query.detail.srcParentId }, 1)
       }
       this.detailData = {
         id: this.$route.query.check.billId,

src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -216,8 +216,8 @@ export default {
                         value: 'id'
                     },
                     cascader: ['recAddress'],
-                    click:()=>{
-                        this.$refs.form.dicInit() 
+                    click: () => {
+                        this.$refs.form.dicInit()
                     },
                     change: (data) => {
                         if (!this.onLoad.id) {
@@ -227,15 +227,15 @@ export default {
                         }
                         if (this.$refs.form.DIC.customerId || !this.onLoad.id) {
                             getCustom({ id: data.value }).then(res => {
-                                if(res.data.data){
+                                if (res.data.data) {
                                     this.dicUrlWithCustomId = res.data.data.id ? res.data.data.id : ''
-                                // this.form.storageId ? this.form.storageId : res.data.data.deliveryWarehouseId
-                                // this.form.storageId = res.data.data.deliveryWarehouseId
-                                this.form.storageId = this.form.storageId ? this.form.storageId : res.data.data.deliveryWarehouseId
-                                this.form.contacts = res.data.data.corpsAttnList[0].cname
-                                this.form.phone = res.data.data.corpsAttnList[0].tel
-                                this.contactsOption = res.data.data.corpsAddrList
-                                this.form.recAddress = res.data.data.corpsAddrList[0].belongtoarea + res.data.data.corpsAddrList[0].detailedAddress
+                                    // this.form.storageId ? this.form.storageId : res.data.data.deliveryWarehouseId
+                                    // this.form.storageId = res.data.data.deliveryWarehouseId
+                                    this.form.storageId = this.form.storageId ? this.form.storageId : res.data.data.deliveryWarehouseId
+                                    this.form.contacts = res.data.data.corpsAttnList[0].cname
+                                    this.form.phone = res.data.data.corpsAttnList[0].tel
+                                    this.contactsOption = res.data.data.corpsAddrList
+                                    this.form.recAddress = res.data.data.corpsAddrList[0].belongtoarea + res.data.data.corpsAddrList[0].detailedAddress
                                 }
                             })
                         }
@@ -377,7 +377,7 @@ export default {
                 index: true,
                 showSummary: true,
                 addBtnText: "添加轮胎",
-                updateBtnText:'保存',
+                updateBtnText: '保存',
                 refreshBtn: false,
                 dialogDrag: true,
                 addBtn: false,
@@ -391,27 +391,27 @@ export default {
                 dialogWidth: "80%",
                 summaryText: "合计",
                 showSummary: true,
-                sumColumnList:[{
-                  name: "goodsNum",
-                  type: "sum"
-                },{
-                  name: "sendNum",
-                  type: "sum"
-                },{
-                  name: "profit",
-                  type: "sum"
-                },{
-                  name: "subTotalMoney",
-                  type: "sum"
-                },{
-                  name: "thisAmount",
-                  type: "sum"
-                },{
-                  name: "costprie",
-                  type: "sum"
-                },{
-                  name: "grossProfit",
-                  type: "sum"
+                sumColumnList: [{
+                    name: "goodsNum",
+                    type: "sum"
+                }, {
+                    name: "sendNum",
+                    type: "sum"
+                }, {
+                    name: "profit",
+                    type: "sum"
+                }, {
+                    name: "subTotalMoney",
+                    type: "sum"
+                }, {
+                    name: "thisAmount",
+                    type: "sum"
+                }, {
+                    name: "costprie",
+                    type: "sum"
+                }, {
+                    name: "grossProfit",
+                    type: "sum"
                 }],
                 column: [{
                     label: '轮胎名称',
@@ -798,8 +798,8 @@ export default {
                 }
             })
             this.isSaveBtn = true;
-                    this.isDisabledTask = true;
-                    this.viewDisabled = true;
+            this.isDisabledTask = true;
+            this.viewDisabled = true;
             // this.$set(this.optionContactsBack, "addBtn", false)
             this['optionContacts'] = this['optionContactsBack'];
             this.delColumnData(this.getColumnName('269.1'), this['optionContactsBack']);
@@ -812,7 +812,7 @@ export default {
             this.viewDisabled = false;
             this.form.businessSource = '内部销售'
         }
-        console.log('this.detailData.check',this.detailData.check);
+        console.log('this.detailData.check', this.detailData.check);
         if (this.detailData.check) {
             this.isExamineBtn = false
             // this.batchNo = this.detailData.check.batchNo
@@ -830,7 +830,7 @@ export default {
         },
         'form.storageId'(newStorageId, oldStorageId) {
             goodsListXs(this.dicUrlWithCustomId, this.form.storageId ? this.form.storageId : '').then(res => {
-                console.log(res.data.data,'2');
+                console.log(res.data.data, '2');
 
                 this.findObject(this.optionContactsBack.column, "goodsId").dicData = res.data.data
             })
@@ -911,12 +911,12 @@ export default {
             goodsListXs(this.dicUrlWithCustomId, this.form.storageId ? this.form.storageId : '').then(res => {
                 this.findObject(this.optionContactsBack.column, "goodsId").dicData = res.data.data
             })
-            if(this.form.status == '已发货'){
-                this.viewDisabled =false
+            if (this.form.status == '已发货') {
+                this.viewDisabled = false
                 return
             }
-            if(this.form.status == '退款中'){
-                this.viewDisabled =false
+            if (this.form.status == '退款中') {
+                this.viewDisabled = false
                 this.isRevocationRequest = true
                 return
             }
@@ -930,7 +930,7 @@ export default {
                 //     }
                 // })
             }
-            if(this.form.status == '退款请核'){
+            if (this.form.status == '退款请核') {
                 this.viewDisabled = false
                 this.isAddBtn = true
                 return
@@ -960,10 +960,10 @@ export default {
             this.isAdd = false
             if (this.form.businessSource == "外部销售") {
                 this.optionForm.column.forEach(its => {
-                        if (its.prop == 'contacts' || its.prop == 'phone'||its.prop == 'recAddress') {
-                            this.$set(its, 'disabled', true)
-                        }
-                    })
+                    if (its.prop == 'contacts' || its.prop == 'phone' || its.prop == 'recAddress') {
+                        this.$set(its, 'disabled', true)
+                    }
+                })
                 if (this.form.status == '待发货') {
                     this.isSaveBtn = false;
                     this.isDisabledTask = false;
@@ -993,7 +993,7 @@ export default {
                     //不能录入不能删除
                     this.isDisabled = true
                     this.isAdd = false
-                    this.isAddBtn= true
+                    this.isAddBtn = true
                     this.$set(this.form, 'shipType', '物流')
                     this.$set(this.form, 'receivableType', '网络支付')
                     this.optionContactsBack.column.forEach(item => {
@@ -1124,7 +1124,7 @@ export default {
                 //         this.isDisabledTask = true
                 //     }
                 // })
-      
+
                 loading.close()
             }
             // this.$set(this.form.orderItemsList,'goodsNum',66)
@@ -1179,7 +1179,9 @@ export default {
                                                 this.isContacts = true
                                                 this.$message.success("生成出库任务成功");
                                                 this.isApplySettlement = false
-
+                                                this.isAdd = true
+                                                this.isDisabled = true
+                                                this.isAddBtn = true
                                             }).finally(() => {
                                                 loading.close();
                                             });
@@ -1225,6 +1227,15 @@ export default {
                                 this.$message.success("撤销出库成功");
                                 this.refresh(res.data.data.id)
                                 this.isApplySettlement = false
+                                this.$set(this.optionForm, 'disabled', true)
+                                this.$set(this.optionContactsBack, 'disabled', true)
+                                this.isContacts = true
+                                this.isDisabled = true
+                                //添加删除按钮禁用
+                                this.isAdd = true
+                                if (this.form.businessSource == "外部销售") {
+
+                                }
                                 loading.close();
                             }).catch((err) => {
                                 console.log(err);
@@ -1364,8 +1375,8 @@ export default {
                     this.isSaveBtn = true;
                     this.isDisabledTask = true;
                     this.viewDisabled = true;
-                } 
-                if(this.form.status === '已发货' ){
+                }
+                if (this.form.status === '已发货') {
                     this.isDisabledTask = true;
                     this.viewDisabled = true;
                     this.isEditButton = false;
@@ -1375,7 +1386,7 @@ export default {
                 //     this.isDisabledTask = true;
                 //     this.viewDisabled = true;
                 // }
-     
+
                 if (this.form.status == '退款中') {
                     this.isConfirmRefundBtn = false;
                 }
@@ -1391,7 +1402,7 @@ export default {
                 if (this.form.status == '退款请核' || this.form.status == '退款中') {
                     this.isRevocationRequest = false;
                 }
-                if(this.form.status == '待发货'){
+                if (this.form.status == '待发货') {
                     this.isApplySettlement = false
                 }
                 //成本、毛利对销售角色隐藏

src/views/tirePartsMall/salesManagement/saleOrder/index.vue

@@ -244,7 +244,7 @@ export default {
 
         }, {
           label: '结算状态',
-          prop: "settlementStatus",
+          prop: "financeStatus",
           search: true,
           overHidden: true,
           type: 'select',
@@ -322,6 +322,9 @@ export default {
         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)
+      }
       this.detailData = {
         id: this.$route.query.check.billId,
         check: this.$route.query.check,

src/views/tirePartsMall/statisticAnalysis/customerTransactions/detailsInfo.vue

@@ -168,7 +168,7 @@ import { getList } from "@/api/tirePartsMall/salesManagement/saleOrder";
 import { pageStatistics, remove, addCorpType, customerList } from "@/api/basicData/customerTransactions";
 import { getDetails, getSellList } from "@/api/basicData/client";
 import { getList as getLists } from "@/api/collectionSettlement/index.js";
-
+import { getDetails as getDetail} from "@/api/tirePartsMall/basicData/customerInformation"
 import { validatenull } from "@/util/validate";
 export default {
     name: "index",
@@ -421,9 +421,15 @@ export default {
         },
         getDetail(id) {
             this.loading = true
-            pageStatistics({ id: id })
+            getDetail({ id: id })
                 .then(res => {
                     this.form = res.data.data;
+                }).finally(() => {
+                    this.loading = false;
+                });
+            pageStatistics({ id: id })
+                .then(res => {
+                    // this.form = res.data.data;
                     this.corpsAddrList = res.data.data.corpsAddrList;
                 })
                 .finally(() => {

src/views/tirePartsMall/statisticAnalysis/customerTransactions/js/optionList.js

@@ -14,7 +14,7 @@ export const option = {
   delBtn: false,
   menuWidth: 130,
   searchIcon: true,
-  menu:false,
+  menu: false,
   searchIndex: 2,
   column: [
     {
@@ -189,7 +189,7 @@ export const option2 = {
         trigger: "blur"
       }
     ]
-  }, 
+  },
   {
     label: "地址",
     prop: "belongtoarea",
@@ -210,7 +210,7 @@ export const option2 = {
     ],
     filterable: true,
     cell: true,
-  }, 
+  },
   {
     label: '详细地址',
     prop: 'detailedAddress',
@@ -378,100 +378,58 @@ export const sellOption = {
   searchIndex: 2,
   column: [
     {
-      label: "单号",
-      prop: "sysNo",
-      overHidden: true,
-      search: true,
-      index: 1
-    },
-    {
-      label: "客户名称",
-      prop: "corpId",
-
-      dicData: [],
+      label: '销售单号',
+      prop: "ordNo",
       search: true,
       overHidden: true,
-      index: 2
     },
     {
-      label: "电话",
-      prop: "tel",
-      type: 'select',
-      dicData: [],
-      search: true,
+      label: '所属公司',
+      prop: "salesCompanyName",
       overHidden: true,
-      index: 3
-    },
-    {
-      label: "日期",
-      prop: "businesDate",
+    }, {
+      label: '业务对象',
+      prop: "customerName",
       search: true,
       overHidden: true,
-      index: 4
-    },
-    {
-      label: "合同金额",
-      prop: "debitAmount",
-      overHidden: true,
-      index: 5
-    },
-    {
-      label: "合同数量",
-      prop: "debitAmount",
+      type: 'select',
+      props: {
+        label: 'cname',
+        value: 'id'
+      },
+      dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=KH',
+    }, {
+      label: '仓库',
+      prop: "storageName",
+      search: true,
       overHidden: true,
-      index: 5
-    },
-    {
-      label: "实际数量",
-      prop: "debitAmount",
+      type: 'select',
+      props: {
+        label: 'cname',
+        value: 'id'
+      },
+      dicUrl: '/api/blade-sales-part/storageDesc/listAll',
+    }, {
+      label: '数量',
+      prop: "goodsTotalNum",
       overHidden: true,
-      index: 5
-    },
-    {
-      label: "已送货",
-      prop: "deliveringAmount",
+    }, {
+      label: '金额',
+      prop: "totalMoney",
       overHidden: true,
-      search: true,
-      index: 6
     },
     {
-      label: "未收款",
-      prop: "balanceAmount",
-      overHidden: true,
+      label: '状态',
+      prop: "status",
       search: true,
-      index: 7
-    },
-    {
-      label: "已收款",
-      prop: "settlmentAmount",
       overHidden: true,
-      search: true,
-      index: 8
-    },
-    // {
-    //   label: "收款状态",
-    //   prop: "actualPaymentStatus",
-    //   type: 'select',
-    //   dataType: "string",
-    //   dicData: [],
-    //   props: {
-    //     label: "dictValue",
-    //     value: "dictKey"
-    //   },
-    //   index: 9
-    // },
-    {
-      label: "状态",
-      prop: "status",
       type: 'select',
-      dataType: "string",
-      dicData: [],
+      dicUrl: "/api/blade-system/dict-biz/dictionary?code=sales_Status",
       props: {
         label: "dictValue",
         value: "dictKey"
-      },
-      search: true,
-      index: 10
+      }
+
     },
     {
       label: "产品",
@@ -484,7 +442,6 @@ export const sellOption = {
         label: "cname",
         value: "cname"
       },
-      index: 11
     },
     {
       label: "客户分类",
@@ -499,7 +456,6 @@ export const sellOption = {
       hide: true,
       search: true,
       showColumn: false,
-      index: 12
     },
     {
       label: "制单人",
@@ -514,7 +470,6 @@ export const sellOption = {
       hide: true,
       search: true,
       showColumn: false,
-      index: 14
     }
   ]
 }
@@ -535,56 +490,97 @@ export const capitalOption = {
   searchIndex: 2,
   column: [
     {
-      label: "单号",
+      label: '单据编号',
       prop: "sysNo",
+      searchOrder:1,
       search: true,
-      overHidden: true
-    },
-    {
-      label: "收款日期",
-      prop: "settlementDate",
+      overHidden: true,
+    }, {
+      label: '合同号',
+      prop: "contractNumber",
+      searchOrder:2,
       search: true,
-      overHidden: true
-    },
-    {
-      label: "类型",
-      prop: "billType",
-      type: "select",
-      dicData: [
-        {
-          label: "收款",
-          value: "D"
-        },
-        {
-          label: "付款",
-          value: "C"
-        }
-      ],
+      overHidden: true,
+    }, {
+      label: "客户",
+      prop: "corpId",
       search: true,
-      overHidden: true
-    },
-    {
-      label: "收款金额",
-      prop: "amount",
-      overHidden: true
-    },
-    {
-      label: "收款账户",
-      prop: "account",
-      type: "select",
+      searchOrder:3,
+      type: 'select',
       props: {
-        label: "dictValue",
-        value: "dictValue"
+        label: 'cname',
+        value: 'id'
       },
-      dicData: [],
+      dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=KH&enableOrNot=0',
+    }, {
+      label: "所属公司",
+      prop: "salesCompanyId",
       search: true,
-      overHidden: true
+      type: 'select',
+      searchOrder:6,
+      props: {
+        label: 'fullName',
+        value: 'id'
+      },
+      dicUrl: '/api/blade-system/dept/top-list'
+    }, {
+      label: '收付款状态',
+      prop: "financeStatus",
+      search: true,
+      searchOrder:5,
+      overHidden: true,
+      type: 'select',
+      dicUrl: "/api/blade-system/dict-biz/dictionary?code=payment_Status",
+      props: {
+        label: "dictValue",
+        value: "dictKey"
+      }
+    }, {
+      label: '收款账户',
+      prop: "accountName",
+      searchOrder:4,
+      search: true,
+      overHidden: true,
+      type: 'select',
+      type:'select',
+      props: {
+        label: 'cname',
+        value: 'id',
+        res: 'data.records'
+      },
+      dicUrl: '/api/blade-sales-part/accountManagement/list?enableOrNot=1&cname={{key}}&billType=HYCK',
+      // dicFormatter: (res => {
+      //   return res.data.records
+      // }),
+    }, {
+      label: '人民币金额',
+      prop: "amount",
+      // search: true,
+      overHidden: true,
+    }, {
+      label: '经办人名称',
+      prop: "handledByName",
+      // search: true,
+      overHidden: true,
+      props: {
+        label: "name",
+        value: "id"
+      },
+      dicUrl: "/api/blade-user/client/gainUser",
+    }, {
+      label: "结算日期",
+      prop: "settlementDate",
+      searchProp: "settlementDateList",
+      searchOrder:5,
+      type: "date",
+      search:true,
+      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: "remark",
-      overHidden: true
-    }
   ]
 }
 

src/views/tirePartsMall/statisticAnalysis/supplierTransactions/detailsInfo.vue

@@ -167,8 +167,8 @@ import { optionList, sellOption, capitalOption } from "./js/optionList";
 import { getList } from "@/api/tirePartsMall/salesManagement/saleOrder";
 import { pageStatistics, remove, addCorpType, customerList } from "@/api/basicData/customerTransactions";
 import { getDetails, getSellList } from "@/api/basicData/client";
-import { getList as getLists } from "@/api/collectionSettlement/index.js";
-
+import {getList as getLists} from "@/api/collectionSettlement/index.js";
+import { getDetails as getDetail } from "@/api/tirePartsMall/basicData/customerInformation";
 import { validatenull } from "@/util/validate";
 export default {
     name: "index",
@@ -361,7 +361,7 @@ export default {
             console.log(data);
             //id: id, status: '待确认,待发货,已发货,退款请核', bsType: 'XS' 
             data.status = '待确认,待发货,已发货,退款请核'
-            getList({ id: this.detailData.id, status: '待确认,待发货,已发货,退款请核', bsType: 'XS' })
+            getList({ id: this.detailData.id, status: '待确认,待发货,已发货,退款请核', bsType: 'CG' })
                 .then(res => {
                     this.sellList = res.data.data.records ? res.data.data.records : [];
                     this.page.total = res.data.data.total;
@@ -382,8 +382,8 @@ export default {
             params = {
                 current: page.currentPage,
                 size: page.pageSize,
-                billType: "SK",
-                dc: 'd',
+                billType: "FK",
+                dc: 'c',
                 ...data
             }
             getLists(params)
@@ -421,9 +421,15 @@ export default {
         },
         getDetail(id) {
             this.loading = true
-            pageStatistics({ id: id })
+            getDetail({ id: id })
                 .then(res => {
                     this.form = res.data.data;
+                }).finally(() => {
+                    this.loading = false;
+                });
+            pageStatistics({ id: id })
+                .then(res => {
+                    // this.form = res.data.data;
                     this.corpsAddrList = res.data.data.corpsAddrList;
                 })
                 .finally(() => {

src/views/tirePartsMall/statisticAnalysis/supplierTransactions/index.vue

@@ -441,7 +441,7 @@ export default {
         data.endTime = data.date[1]
       }
       delete data.date
-      data.corpType = "KH"
+      data.corpType = "GYS"
       this.loading = true;
       getList(
         page.currentPage,

src/views/tirePartsMall/statisticAnalysis/supplierTransactions/js/optionList.js

@@ -378,144 +378,78 @@ export const sellOption = {
   searchIndex: 2,
   column: [
     {
-      label: "单号",
-      prop: "sysNo",
-      overHidden: true,
-      search: true,
-      index: 1
-    },
-    {
-      label: "客户名称",
-      prop: "corpId",
-
-      dicData: [],
+      label: '采购单号',
+      prop: "ordNo",
       search: true,
       overHidden: true,
-      index: 2
     },
     {
-      label: "电话",
-      prop: "tel",
-      type: 'select',
-      dicData: [],
-      search: true,
+      label: '所属公司',
+      prop: "salesCompanyName",
       overHidden: true,
-      index: 3
-    },
-    {
-      label: "日期",
-      prop: "businesDate",
+    }, {
+      label: '业务对象',
+      prop: "customerName",
       search: true,
       overHidden: true,
-      index: 4
-    },
-    {
-      label: "合同金额",
-      prop: "debitAmount",
+      type: 'select',
+      props: {
+        label: 'cname',
+        value: 'id'
+      },
+      dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=GYS&enableOrNot=0',
+    }, {
+      label: '仓库',
+      prop: "storageName",
+      search: true,
       overHidden: true,
-      index: 5
-    },
-    {
-      label: "合同数量",
-      prop: "debitAmount",
+      type: 'select',
+      props: {
+        label: 'cname',
+        value: 'id'
+      },
+      dicUrl: '/api/blade-sales-part/storageDesc/listAll',
+    }, {
+      label: '数量',
+      prop: "goodsTotalNum",
       overHidden: true,
-      index: 5
-    },
-    {
-      label: "实际数量",
-      prop: "debitAmount",
-      overHidden: true,
-      index: 5
-    },
-    // {
-    //   label: "已送货",
-    //   prop: "deliveringAmount",
-    //   overHidden: true,
-    //   search: true,
-    //   index: 6
-    // },
-    {
-      label: "未付款",
-      prop: "balanceAmount",
+    }, {
+      label: '金额',
+      prop: "totalMoney",
       overHidden: true,
+    },{
+      label: '状态',
+      prop: "status",
       search: true,
-      index: 7
-    },
-    {
-      label: "已付款",
-      prop: "settlmentAmount",
       overHidden: true,
-      search: true,
-      index: 8
-    },
-    // {
-    //   label: "收款状态",
-    //   prop: "actualPaymentStatus",
-    //   type: 'select',
-    //   dataType: "string",
-    //   dicData: [],
-    //   props: {
-    //     label: "dictValue",
-    //     value: "dictKey"
-    //   },
-    //   index: 9
-    // },
-    {
-      label: "状态",
-      prop: "status",
       type: 'select',
-      dataType: "string",
-      dicData: [],
+      dicUrl: "/api/blade-system/dict-biz/dictionary?code=procurement_Status",
       props: {
         label: "dictValue",
         value: "dictKey"
-      },
-      search: true,
-      index: 10
-    },
-    {
-      label: "产品",
-      prop: "cname",
-      type: "select",
-      dicData: [],
-      search: true,
-      filterable: true,
-      props: {
-        label: "cname",
-        value: "cname"
-      },
-      index: 11
-    },
-    {
-      label: "客户分类",
-      prop: "corpType",
-      type: "tree",
-      dicData: [],
-      filterable: true,
-      props: {
-        label: "title",
-        value: "id"
-      },
-      hide: true,
-      search: true,
-      showColumn: false,
-      index: 12
+      }
     },
+    // {
+    //   label: '应结日期',
+    //   prop: "dueDate",
+    //   overHidden: true,
+    // }, 
     {
       label: "制单人",
-      prop: "createUser",
-      type: "select",
+      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: "name",
-        value: "id"
-      },
-      dicData: [],
-      hide: true,
-      search: true,
-      showColumn: false,
-      index: 14
-    }
+        label: "account",
+        value: "id",
+        res: 'data.records'
+      }
+    },
   ]
 }
 export const capitalOption = {
@@ -535,56 +469,84 @@ export const capitalOption = {
   searchIndex: 2,
   column: [
     {
-      label: "单号",
+      label: '单据编号',
       prop: "sysNo",
+      searchOrder:1,
       search: true,
-      overHidden: true
-    },
-    {
-      label: "付款日期",
-      prop: "settlementDate",
+      overHidden: true,
+    }, {
+      label: '合同号',
+      prop: "contractNumber",
+      searchOrder:2,
       search: true,
-      overHidden: true
-    },
-    {
-      label: "类型",
-      prop: "billType",
-      type: "select",
-      dicData: [
-        {
-          label: "收款",
-          value: "D"
-        },
-        {
-          label: "付款",
-          value: "C"
-        }
-      ],
+      overHidden: true,
+    }, {
+      label: "客户",
+      prop: "corpId",
       search: true,
-      overHidden: true
-    },
-    {
-      label: "付款金额",
-      prop: "amount",
-      overHidden: true
-    },
-    {
-      label: "付款账户",
-      prop: "account",
-      type: "select",
+      searchOrder:3,
+      type: 'select',
       props: {
-        label: "dictValue",
-        value: "dictValue"
+        label: 'cname',
+        value: 'id'
       },
-      dicData: [],
+      dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=KH&enableOrNot=0',
+    }, {
+      label: "所属公司",
+      prop: "salesCompanyId",
       search: true,
-      overHidden: true
-    },
-    {
-      label: "备注",
-      prop: "remark",
-      overHidden: true
-    }
+      type: 'select',
+      searchOrder:6,
+      props: {
+        label: 'fullName',
+        value: 'id'
+      },
+      dicUrl: '/api/blade-system/dept/top-list'
+    }, {
+      label: '收付款状态',
+      prop: "financeStatus",
+      search: true,
+      searchOrder:5,
+      overHidden: true,
+      type: 'select',
+      dicUrl: "/api/blade-system/dict-biz/dictionary?code=payment_Status",
+      props: {
+        label: "dictValue",
+        value: "dictKey"
+      }
+    }, {
+      label: '收款账户',
+      prop: "accountName",
+      searchOrder:4,
+      search: true,
+      overHidden: true,
+      type: 'select',
+      type:'select',
+      props: {
+        label: 'cname',
+        value: 'id',
+        res: 'data.records'
+      },
+      dicUrl: '/api/blade-sales-part/accountManagement/list?enableOrNot=1&cname={{key}}&billType=HYCK',
+      // dicFormatter: (res => {
+      //   return res.data.records
+      // }),
+    }, {
+      label: '人民币金额',
+      prop: "amount",
+      // search: true,
+      overHidden: true,
+    }, {
+      label: '经办人名称',
+      prop: "handledByName",
+      // search: true,
+      overHidden: true,
+      props: {
+        label: "name",
+        value: "id"
+      },
+      dicUrl: "/api/blade-user/client/gainUser",
+    }, 
   ]
 }