提交bug

src/api/basicData/inventoryAccount.js

@@ -91,3 +91,14 @@ export function calculateInventory() {
     method: 'get'
   })
 }
+
+//轮胎库存查询明细账
+export const stockDataDetails = (params) => {
+  return request({
+    url: '/api/blade-sales-part/ship/stockDataDetails',
+    method: 'get',
+    params: {
+      ...params
+    }
+  })
+}

src/components/report-dialog/main.vue

@@ -124,6 +124,13 @@ export default {
     },
     getList() {
       this.loading = true;
+      console.log(this.query.name);
+      let userObj = JSON.parse(localStorage.getItem("saber-userInfo")).content.tenant_id;
+      if(this.query.name == '国内贸易-发货通知单' && userObj != '681169'){
+        console.log('6666666');
+        this.$set(this.query,'name','国内贸易-采购单')
+        // this.query.name == '国内贸易-采购单'
+      }
       getList(
         this.page.currentPage,
         this.page.pageSize,

src/views/businessManagement/inventoryAccount/index.vue

@@ -18,6 +18,9 @@
 <!--          <span v-if="Number(scope.row.lockingQuantity) > 0" style="color: #409EFF;cursor: pointer" @click.stop="viewCell(scope.row,scope.index)">{{ scope.row.lockingQuantity }}</span>-->
 <!--          <span v-else>{{ scope.row.lockingQuantity }}</span>-->
         </template>
+        <template slot-scope="scope" slot="surplusRouteQuantity">
+          <span style="color: #409EFF;cursor: pointer" @click.stop="availableClick(scope.row,scope.index)">{{ scope.row.surplusRouteQuantity }}</span>
+        </template>
         <template slot="stockNameSearch">
           <warehouse-select v-model="search.storageId" :configuration="configurationWarehouse" />
         </template>
@@ -360,6 +363,9 @@ export default {
         });
       })
     },
+    availableClick(row){
+
+    }
   }
 }
 </script>

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/brandPage/detailsPage.vue

@@ -114,6 +114,7 @@ export default {
     },
     //是否启用
     enableNot(){
+      const { brandFilesList, ...formWithoutBrandFilesList } = this.form;
       const loading = this.$loading({
         lock: true,
         text: '加载中',
@@ -121,7 +122,7 @@ export default {
         background: 'rgba(255,255,255,0.7)'
       })
       updateEnableOrNot({
-        ...this.form,
+        ...formWithoutBrandFilesList,
         enableOrNot:this.form.enableOrNot == 0?1:0
       }).then(res=>{
         loading.close()

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

@@ -9,10 +9,10 @@
                     </el-button>
                 </div>
                 <div class="add-customer-btn">
-                    <el-button v-if="form.enableOrNot == 1" size="small" @click="disabled(0)">
+                    <el-button v-if="form.enableOrNot == 0" size="small" @click="disabled(1)">
                         启用
                     </el-button>
-                    <el-button v-if="form.enableOrNot == 0" size="small" @click="disabled(1)">
+                    <el-button v-if="form.enableOrNot == 1" size="small" @click="disabled(0)">
                         禁用
                     </el-button>
                     <el-button type="primary" size="small" @click="editCustomer">
@@ -601,10 +601,10 @@ export default {
                 
                 this.$message({
                     type: "success",
-                    message: val ? '禁用成功' : '启用成功'
+                    message: val ? '启用成功' : '禁用成功'
                 });
                 this.getDetail(this.detailData.id);
-                if(val == 1){
+                if(val == 0){
                     console.log('禁用中');
                     this.option.disabled = false;
                     for (let item of this.option.column) {

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

@@ -95,7 +95,7 @@ export default {
             label: 'cname',
             value: 'id'
           },
-          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=KH&enableOrNot=0',
+          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=KH&enableOrNot=1',
           rules: [{
             required: true,
             message: " ",
@@ -108,18 +108,21 @@ export default {
           type: 'select',
           props: {
             label: 'cname',
-            value: 'cname'
+            value: 'id',
+            res: 'data.records'
+          },
+          click: () => {
+            this.$refs.form.dicInit()
           },
           dicUrl: '/api/blade-sales-part/accountManagement/list?enableOrNot=1&cname={{key}}&billType=HYCK',
-          dicFormatter: (res => {
-            return res.data.records
-          }),
-          change: (data => {
-            console.log(data);
-            console.log(this.$refs.form.DIC.accountName);
-            const targetObject = this.$refs.form.DIC.accountName.find(obj => obj.cname == data.value);
-            this.form.accountId = targetObject.id
-          }),
+          // change: (data => {
+          //   console.log(data);
+          //   console.log(this.$refs.form.DIC.accountName);
+          //   if(this.$refs.form.DIC.accountName){
+          //     const targetObject = this.$refs.form.DIC.accountName.find(obj => obj.cname == data.value);
+          //     this.form.accountId = targetObject.id
+          //   }
+          // }),
           rules: [{
             required: true,
             message: " ",
@@ -277,8 +280,10 @@ export default {
       this.$set(this.optionContactsBack, 'disabled', true)
       this.isSaveBtn = true
       this.isFinanceBtn = true
+      
       this.isMenu = true
     } else {
+      this.isFinanceBtn = true
       this.findObject(this.optionForm.column, 'settlementDate').value = todayDateTime
       this.editButton = true
       // console.log(this.form.settlementDate = '2023-07-03');
@@ -397,6 +402,8 @@ export default {
           });
           saveSubmit(data).then(res => {
             console.log(res);
+            this.isFinanceBtn = false
+            this.refresh(res.data.data.id)
             this.$message.success('保存成功')
             loading.close();
           }).catch(() => {
@@ -485,7 +492,7 @@ export default {
       this.$router.$avueRouter.closeTag('/tirePartsMall/salesManagement/saleOrder/index');
       this.$router.push({
         path: "/tirePartsMall/salesManagement/saleOrder/index",
-        query: { detail:row,type:'S'},
+        query: { detail: row, type: 'S' },
       });
     },
     //关闭

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

@@ -91,6 +91,7 @@ export default {
           label: "客户",
           prop: "corpId",
           search: true,
+          remote:true,
           searchOrder:3,
           type: 'select',
           props: {
@@ -98,6 +99,10 @@ export default {
             value: 'id'
           },
           dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=KH&enableOrNot=0',
+          click: () => {
+            console.log('555555');
+            this.$refs.crud.dicInit()
+          },
         }, {
           label: "所属公司",
           prop: "salesCompanyId",
@@ -116,7 +121,7 @@ export default {
           searchOrder:5,
           overHidden: true,
           type: 'select',
-          dicUrl: "/api/blade-system/dict-biz/dictionary?code=payment_Status",
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=put_Status",
           props: {
             label: "dictValue",
             value: "dictKey"
@@ -128,7 +133,6 @@ export default {
           search: true,
           overHidden: true,
           type: 'select',
-          type:'select',
           props: {
             label: 'cname',
             value: 'id',
@@ -195,6 +199,9 @@ export default {
       this.option.searchMenuSpan = num * 8;
       this.option.searchMenuPosition = "right";
     }
+    // this.findObject(this.optionList.column,'corpId').click = ()=>{
+    //   console.log('点击了');
+    // }
   },
   // 解决AVue表格错位问题
   activated() {

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

@@ -92,7 +92,7 @@ export default {
             label: 'cname',
             value: 'id'
           },
-          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=GYS&enableOrNot=0',
+          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=GYS&enableOrNot=1',
           rules: [{
             required: true,
             message: " ",
@@ -130,13 +130,13 @@ export default {
             message: " ",
             trigger: "blur"
           }]
-        }, {
+        },{
           label: "经办人",
-          prop: "handledById",
+          prop: "handledByName",
           type: "select",
           props: {
             label: "name",
-            value: "id"
+            value: "name"
           },
           dicUrl: "/api/blade-user/client/gainUser",
           filterable: true,
@@ -144,7 +144,8 @@ export default {
             required: true,
             message: " ",
             trigger: "blur"
-          }]
+          }],
+          value: '青岛'
         }, {
           label: '付款日期',
           prop: "settlementDate",
@@ -154,7 +155,8 @@ export default {
           searchRange: true,
           searchDefaultTime: ["00:00:00", "23:59:59"],
           format: "yyyy-MM-dd",
-          valueFormat: "yyyy-MM-dd HH:mm:ss"
+          valueFormat: "yyyy-MM-dd HH:mm:ss",
+          value:''
         }, {
           label: '单据编号',
           prop: "sysNo",
@@ -229,6 +231,17 @@ export default {
       this.form.amount = Number(thisAmountSum)
     }
     console.log(this.onLoad.id);
+     //  获取今天的日期
+     var today = new Date();
+    var year = today.getFullYear();
+    var month = String(today.getMonth() + 1).padStart(2, '0');
+    var day = String(today.getDate()).padStart(2, '0');
+    var hours = String(today.getHours()).padStart(2, '0');
+    var minutes = String(today.getMinutes()).padStart(2, '0');
+    var seconds = String(today.getSeconds()).padStart(2, '0');
+
+    // 构建今天的日期时间字符串
+    var todayDateTime = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds;
     if (this.onLoad.id) {
       this.refresh(this.onLoad.id)
       this.$set(this.optionForm, 'disabled', true)
@@ -237,6 +250,7 @@ export default {
       this.isFinanceBtn = true
       this.isMenu = true
     }else{
+      this.findObject(this.optionForm.column, 'settlementDate').value = todayDateTime
       this.editButton = true
     }
   },
@@ -326,6 +340,7 @@ export default {
           });
           saveSubmit(data).then(res => {
             console.log(res);
+            this.refresh(res.data.data.id)
             this.$message.success('保存成功')
             loading.close();
           }).catch(() => {

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

@@ -143,7 +143,7 @@ export default {
           search: true,
           overHidden: true,
           type:'select',
-          dicUrl: "/api/blade-system/dict-biz/dictionary?code=payment_status_fu",
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=payment_Status",
           props: {
             label: "dictValue",
             value: "dictKey"

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

@@ -34,66 +34,52 @@
     "column": [
         {
             "label": "业务编号",
-            "prop": "sysNo",
+            "prop": "billno",
             "search": false,
-            "index": 1,
             "minWidth": 80,
             "overHidden": true,
             "searchSpan": 8
         },
         {
-            "label": "业务日期",
-            "prop": "businessDate",
+            "label": "名称",
+            "prop": "corpName",
             "search": false,
-            "index": 2,
             "minWidth": 80,
             "overHidden": true,
             "searchSpan": 8
         },
         {
-            "label": "名称",
-            "prop": "goodsName",
-            "search": false,
-            "index": 3,
+            "label": "状态",
+            "prop": "statusName",
             "minWidth": 80,
-            "overHidden": true,
-            "searchSpan": 8
+            "overHidden": true
         },
+         
         {
             "label": "类型",
-            "prop": "orderType",
-            "index": 4,
+            "prop": "bizTypeName",
             "minWidth": 80,
             "overHidden": true
         },
         {
             "label": "增加",
-            "prop": "addQuantity",
-            "index": 4,
+            "prop": "addSendTotalNum",
             "minWidth": 80,
             "overHidden": true
         },
         {
             "label": "减少",
-            "prop": "subQuantity",
-            "index": 4,
-            "minWidth": 80,
-            "overHidden": true
-        },
-        {
-            "label": "结余",
-            "prop": "totalQuantity",
-            "index": 4,
-            "hide":true,
+            "prop": "SubSendTotalNum",
             "minWidth": 80,
             "overHidden": true
         },
         {
-            "label": "状态",
-            "prop": "status",
-            "index": 4,
+            "label": "业务日期",
+            "prop": "updateTime",
+            "search": false,
             "minWidth": 80,
-            "overHidden": true
+            "overHidden": true,
+            "searchSpan": 8
         }
     ]
 }

src/views/tirePartsMall/inventory/detail.vue

@@ -24,7 +24,7 @@
   
   <script>
   import option from "./config/detail.json";
-  import {selectStockInventory} from "@/api/basicData/inventoryAccount";
+  import {stockDataDetails} from "@/api/basicData/inventoryAccount";
   
   export default {
     name: "detail",
@@ -65,7 +65,7 @@
           this.$refs.crud.toggleRowExpansion(item, false)
         })
         this.loading = true;
-        selectStockInventory(params)
+        stockDataDetails(params)
           .then(res => {
             console.log('res',res);
             this.dataList = res.data.data? res.data.data : [];

src/views/tirePartsMall/inventory/index.vue

@@ -16,8 +16,8 @@
             <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 }}
+            <template slot-scope="{ row }" slot="balanceQuantity">
+              <span style="color: #409EFF;cursor: pointer" @click.stop="storeInventoryOpen(row)">{{ row.balanceQuantity }}
               </span>
             </template>
           </avue-crud>
@@ -151,7 +151,7 @@ export default {
           }, {
             label: '仓库',
             prop: "storageName",
-            searchProp: "storageId",
+            // searchProp: "storageId",
             search: true,
             overHidden: true,
             type: 'select',
@@ -201,6 +201,7 @@ export default {
             hide: true,
             width: 120,
             searchLabelWidth: 120,
+            searchValue:'否',
             dicData: [{
               "label": "是",
               "value": "1"
@@ -284,7 +285,9 @@ export default {
       this.onLoad(this.page, params)
     },
     onLoad(page, params = {}) {
+      console.log(params);
       params = {
+        storageId:params.storageName,
         current: page.currentPage,
         size: page.pageSize,
         ...Object.assign(params, this.search)
@@ -293,6 +296,9 @@ export default {
       getList(params).then(res => {
         this.dataList = res.data.data.records
         this.page.total = res.data.data.total
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.loading = false
       }).finally(() => {
         this.loading = false

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

@@ -176,7 +176,7 @@ export default {
         searchIndex: 2,
         highlightCurrentRow: true,
         expand: true,
-        expandWidth: 38,
+        expandWidth: 60,
         dialogWidth: "70%",
         summaryText: "合计",
         showSummary: true,
@@ -254,13 +254,13 @@ export default {
           type: "select",
           dicData: [{
             label: "待入库",
-            value: 0
+            value: "待入库"
           }, {
             label: "已入库",
-            value: 1
+            value: "已入库"
           }, {
             label: "已撤销",
-            value: 1
+            value: "已撤销"
           }],
           // width: 120,
         }, {
@@ -441,6 +441,9 @@ export default {
         }
         this.dataList = res.data.data.records
         this.page.total = res.data.data.total
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.loading = false
       }).finally(() => {
         this.loading = false

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

@@ -463,6 +463,7 @@ export default {
           }).then(res => {
             this.$message.success("保存成功");
             this.refresh(res.data.data.id)
+            
             loading.close();
           }).finally(() => {
             loading.close();
@@ -529,6 +530,9 @@ export default {
               this.isDisabled = true
           }
         this.form = res.data.data
+        this.$nextTick(() => {
+          this.$refs.formContacts.refreshTable()
+        })
         loading.close();
       }).catch(() => {
         loading.close();

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

@@ -151,7 +151,7 @@ export default {
         searchIndex: 2,
         highlightCurrentRow: true,
         expand: true,
-        expandWidth: 38,
+        expandWidth: 60,
         dialogWidth: "70%",
         summaryText: "合计",
         showSummary: true,
@@ -377,6 +377,9 @@ export default {
         }
         this.dataList = res.data.data.records
         this.page.total = res.data.data.total
+         this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.loading = false
       }).finally(() => {
         this.loading = false

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

@@ -60,7 +60,8 @@
                         <!-- 地址 -->
                         <el-select v-model="form.recAddress" placeholder="请选择" size="small" style="width:60%" filterable
                             :disabled=isContacts>
-                            <el-option v-for="item in recAddressOption" :key="item.id" :label="item.belongtoarea + item.detailedAddress"
+                            <el-option v-for="item in recAddressOption" :key="item.id"
+                                :label="item.belongtoarea + item.detailedAddress"
                                 :value="item.belongtoarea + item.detailedAddress" />
                         </el-select>
                     </template>
@@ -189,7 +190,7 @@ export default {
             isDisabled: false,
             isDisabledTask: false,
             //地址
-            recAddressOption:[],
+            recAddressOption: [],
             contactsOption: [],
             isContacts: false,
             checkData: {},
@@ -227,8 +228,8 @@ export default {
                         value: 'id'
                     },
                     cascader: ['recAddress'],
-                    click:()=>{
-                        this.$refs.form.dicInit() 
+                    click: () => {
+                        this.$refs.form.dicInit()
                     },
                     change: (data) => {
                         if (!this.onLoad.id) {
@@ -266,7 +267,7 @@ export default {
                         //     }
                         // }
                     },
-                    dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=GYS&enableOrNot=0',
+                    dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=GYS&enableOrNot=1',
                     rules: [{
                         required: true,
                         message: " ",
@@ -382,6 +383,11 @@ export default {
                     disabled: true
                 },
                 {
+                    label: '结算金额',
+                    prop: "paymentAmountTl",
+                    disabled: true
+                },
+                {
                     label: '备注',
                     prop: "remarks",
                     type: 'textarea',
@@ -398,7 +404,7 @@ export default {
                 align: 'center',
                 index: true,
                 showSummary: true,
-                
+
                 addBtnText: "添加轮胎",
                 updateBtnText: '保存',
                 refreshBtn: false,
@@ -414,21 +420,21 @@ export default {
                 dialogWidth: "80%",
                 summaryText: "合计",
                 showSummary: true,
-                sumColumnList:[{
-                  name: "goodsNum",
-                  type: "sum"
-                },{
-                  name: "price",
-                  type: "sum",
-                  decimals: 2
-                },{
-                  name: "sendNum",
-                  type: "sum",
-                  decimals: 2
-                },{
-                  name: "subTotalMoney",
-                  type: "sum",
-                  decimals: 2
+                sumColumnList: [{
+                    name: "goodsNum",
+                    type: "sum"
+                }, {
+                    name: "price",
+                    type: "sum",
+                    decimals: 2
+                }, {
+                    name: "sendNum",
+                    type: "sum",
+                    decimals: 2
+                }, {
+                    name: "subTotalMoney",
+                    type: "sum",
+                    decimals: 2
                 }],
                 column: [{
                     label: '轮胎名称',
@@ -444,7 +450,7 @@ export default {
                         value: 'id'
                     },
                     // dicUrl: '/api/blade-sales-part/goodsDesc/goodsListAll?cname={{key}}'
-                    dicUrl: "/api/blade-sales-part/goodsDesc/goodsListAll?cname={{key}}&enableOrNot=0"
+                    dicUrl: "/api/blade-sales-part/goodsDesc/goodsListAll?cname={{key}}&enableOrNot=1"
                     // dicUrl: "/api/blade-sales-part/goodsDesc/goodsListXs?cname={{key}}"
                 }, {
                     label: '数量',
@@ -850,23 +856,23 @@ export default {
         //         this.findObject(this.optionContactsBack.column, "goodsId").dicData = res.data.data
         //     })
         // },
-        'form.orderItemsList.length'(newformContacts, oldformContacts) {
-            console.log(this.formContacts);
-            console.log(this.form.orderItemsList);
-            // for (let i = 0; i < this.form.orderItemsList.length - 1; i++) {
-            //     const currentItem = this.form.orderItemsList[i];
-            //     const nextItem = this.form.orderItemsList[i + 1];
+        // 'form.orderItemsList.length'(newformContacts, oldformContacts) {
+        //     console.log(this.formContacts);
+        //     console.log(this.form.orderItemsList);
+        //     // for (let i = 0; i < this.form.orderItemsList.length - 1; i++) {
+        //     //     const currentItem = this.form.orderItemsList[i];
+        //     //     const nextItem = this.form.orderItemsList[i + 1];
 
-            //     if (currentItem.sharedCompanyId !== nextItem.sharedCompanyId) {
-            //         console.log('不能添加');
-            //     }
-            // }
-            if (this.form.orderItemsList.length) {
-                this.findObject(this.optionForm.column, 'storageId').disabled = true
-            } else {
-                this.findObject(this.optionForm.column, 'storageId').disabled = false
-            }
-        },
+        //     //     if (currentItem.sharedCompanyId !== nextItem.sharedCompanyId) {
+        //     //         console.log('不能添加');
+        //     //     }
+        //     // }
+        //     if (this.form.orderItemsList.length) {
+        //         this.findObject(this.optionForm.column, 'storageId').disabled = true
+        //     } else {
+        //         this.findObject(this.optionForm.column, 'storageId').disabled = false
+        //     }
+        // },
         'form.sharedCompanyId'(newSharedCompanyId, oldSharedCompanyId) {
             console.log(newSharedCompanyId, oldSharedCompanyId);
             if (newSharedCompanyId != oldSharedCompanyId) {
@@ -1085,7 +1091,8 @@ export default {
                     // this.$set(this.optionContactsBack, 'disabled', false)
                     this.$set(this.optionForm, 'disabled', false)
                     this.$set(this.optionContactsBack, 'disabled', false)
-                    this.isContacts = true
+                   
+                    this.isContacts = false
                     //删除按钮
                     this.isDisabled = false
                     // this.optionForm.column.forEach(item => {
@@ -1098,7 +1105,7 @@ export default {
                     this.isDisabledTask = false;
                     this.isAddBtn = false;
                     this.isAdd = false;
-                    this.isDisabled =false
+                    this.isDisabled = false
                     this.viewDisabled = false;
                     // this.isDisabled = true
                     console.log('待确认');
@@ -1365,9 +1372,13 @@ export default {
                 this.form = res.data.data
                 let ordForm = { srcBillNo: this.form.ordNo }
                 let _this = this
-                getList(1, 50, ordForm).then((res) => {
-                    this.dataList = res.data.data.records ? res.data.data.records : [];
-                })
+                this.dataList = res.data.data.paymentRecordsList ? res.data.data.paymentRecordsList : [];
+                // getList(1, 50, ordForm).then((res) => {
+                //     this.dataList = res.data.data.records ? res.data.data.records : [];
+                //     this.$nextTick(() => {
+                //         this.$refs.formContacts.doLayout()
+                //     })
+                // })
                 if (this.form.status !== '录入' && this.form.status !== '退款中' && this.form.status !== '已取消' && this.form.status !== '退款请核' && this.form.status !== '已退款' && this.form.status !== '待确认' && this.form.status !== '待发货') {
                     console.log(1);
                     this.isApplySettlement = false;
@@ -1616,7 +1627,11 @@ export default {
             );
         },
         rowSave(form, done, loading) {
+
+            form.subTotalMoney = form.goodsNum * form.price
+            form.goodsName = form.$goodsId
             if (this.isStatus) {
+                console.log(form);
                 done(form)
             } else {
                 this.$message.error('请选择相同商户的轮胎')

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

@@ -216,7 +216,7 @@ export default {
         searchIndex: 2,
         highlightCurrentRow: true,
         expand: true,
-        expandWidth: 38,
+        expandWidth: 60,
         dialogWidth: "70%",
         summaryText: "合计",
         showSummary: true,
@@ -292,18 +292,6 @@ 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,
@@ -315,6 +303,33 @@ export default {
             value: "dictKey"
           }
         },
+        {
+          label: '结算状态',
+          prop: "actualPaymentStatus",
+          searchProp:'actualPaymentType',
+          search: true,
+          overHidden: true,
+          type: 'select',
+          dicData: [
+            {
+              label: "待付款",
+              value: 1,
+            },
+            {
+              label: "已付款",
+              value: 2,
+            },
+            {
+              label: "尾款",
+              value: 3,
+            }
+          ],
+          // dicUrl: "/api/blade-system/dict-biz/dictionary?code=settlement_Status",
+          // props: {
+          //   label: "dictValue",
+          //   value: "dictKey"
+          // }
+        },
         // {
         //   label: '应结日期',
         //   prop: "dueDate",
@@ -476,6 +491,9 @@ export default {
         }
         this.dataList = res.data.data.records
         this.page.total = res.data.data.total
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.loading = false
       }).finally(() => {
         this.loading = false

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

@@ -252,7 +252,7 @@ export default {
                         //     }
                         // }
                     },
-                    dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=KH&enableOrNot=0',
+                    dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=KH&enableOrNot=1',
                     rules: [{
                         required: true,
                         message: " ",
@@ -360,6 +360,10 @@ export default {
                     prop: "totalMoney",
                     disabled: true
                 }, {
+                    label: '结算金额',
+                    prop: "paymentAmountTl",
+                    disabled: true
+                },{
                     label: '备注',
                     prop: "remarks",
                     type: 'textarea',
@@ -427,7 +431,7 @@ export default {
                         value: 'id'
                     },
                     // dicUrl: '/api/blade-sales-part/goodsDesc/goodsListAll?cname={{key}}'
-                    dicUrl: "/api/blade-sales-part/goodsDesc/goodsListXs?cname={{key}}&customId=1658279303722418177&enableOrNot=0"
+                    dicUrl: "/api/blade-sales-part/goodsDesc/goodsListXs?cname={{key}}&customId=1658279303722418177&enableOrNot=1"
                     // dicUrl: "/api/blade-sales-part/goodsDesc/goodsListXs?cname={{key}}"
                 }, {
                     label: '数量',
@@ -1356,9 +1360,14 @@ export default {
                 this.form = res.data.data
                 let ordForm = { srcBillNo: this.form.ordNo }
                 let _this = this
-                getList(1, 50, ordForm).then((res) => {
-                    this.dataList = res.data.data.records ? res.data.data.records : [];
-                })
+                
+                this.dataList = res.data.data.paymentRecordsList ? res.data.data.paymentRecordsList : [];
+                // getList(1, 50, ordForm).then((res) => {
+                //     this.dataList = res.data.data.records ? res.data.data.records : [];
+                //     this.$nextTick(() => {
+                //         this.$refs.formContacts.doLayout()
+                //     })
+                // })
                 if (this.form.status !== '录入' && this.form.status !== '退款中' && this.form.status !== '已取消' && this.form.status !== '退款请核' && this.form.status !== '已退款' && this.form.status !== '待确认' && this.form.status !== '待发货') {
                     console.log(1);
                     this.isApplySettlement = false;

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

@@ -157,7 +157,7 @@ export default {
         searchSpan: 8,
         searchIcon: true,
         expand: true,
-        expandWidth: 38,
+        expandWidth: 60,
         searchIndex: 2,
         highlightCurrentRow: true,
         dialogWidth: "70%",
@@ -241,18 +241,33 @@ export default {
             label: "dictValue",
             value: "dictKey"
           }
-
         }, {
           label: '结算状态',
-          prop: "financeStatus",
+          prop: "actualPaymentStatus",
+          searchProp:'actualPaymentType',
           search: true,
           overHidden: true,
           type: 'select',
-          dicUrl: "/api/blade-system/dict-biz/dictionary?code=settlement_Status",
-          props: {
-            label: "dictValue",
-            value: "dictKey"
-          }
+          dicData: [
+            {
+              label: "待付款",
+              value: 1,
+            },
+            {
+              label: "已付款",
+              value: 2,
+            },
+            {
+              label: "尾款",
+              value: 3,
+            }
+          ],
+
+          // dicUrl: "/api/blade-system/dict-biz/dictionary?code=settlement_Status",
+          // props: {
+          //   label: "dictValue",
+          //   value: "dictKey"
+          // }
 
         }, {
           label: '应结日期',
@@ -322,7 +337,7 @@ export default {
         this.editOpen({ id: this.$route.query.check.srcBillId }, 1)
         this.$store.commit("IN_LTXS_STATUS");
       }
-      if(this.$route.query.type == 'S'){
+      if (this.$route.query.type == 'S') {
         this.editOpen({ id: this.$route.query.detail.srcParentId }, 1)
       }
       this.detailData = {
@@ -426,6 +441,9 @@ export default {
         }
         this.dataList = res.data.data.records
         this.page.total = res.data.data.total
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.loading = false
       }).finally(() => {
         this.loading = false

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

@@ -7,11 +7,11 @@
                         @click="backToList">返回列表
                     </el-button>
                 </div>
-                <div class="add-customer-btn">
+                <!-- <div class="add-customer-btn">
                     <el-button type="primary" size="small" @click="editCustomer">
                         编辑
                     </el-button>
-                </div>
+                </div> -->
             </div>
         </div>
         <containerTitle title="基础信息" style="margin-top: 60px"></containerTitle>
@@ -25,22 +25,22 @@
                         <div class="stat-tip">
                             <div class="money">
                                 <span style="font-size:20px;">￥</span>
-                                <avue-count-up :end="form.debitAmount"></avue-count-up>
+                                <avue-count-up :end="forms.totalAmount"></avue-count-up>
                             </div>
                             <div class="title">合同金额</div>
                         </div>
                     </td>
-                    <td class="stat-td">
+                    <!-- <td class="stat-td">
                         <img src="@/assets/img/deliveredBg.png" class="stat-img">
                         <div class="stat-tip">
                             <div class="money">
                                 <span style="font-size:20px;">￥</span>
                                 <avue-count-up :end="form.deliveringAmount"></avue-count-up>
                             </div>
-                            <div class="title">已送货</div>
+                            <div class="title">已发货</div>
                         </div>
-                    </td>
-                    <td class="stat-td">
+                    </td> -->
+                    <!-- <td class="stat-td">
                         <img src="@/assets/img/advanceCollectionBg.png" class="stat-img">
                         <div class="stat-tip">
                             <div class="money">
@@ -49,13 +49,13 @@
                             </div>
                             <div class="title">预收款</div>
                         </div>
-                    </td>
+                    </td> -->
                     <td class="stat-td">
                         <img src="@/assets/img/uncollectedBg.png" class="stat-img">
                         <div class="stat-tip">
                             <div class="money">
                                 <span style="font-size:20px;">￥</span>
-                                <avue-count-up :end="form.balanceAmount"></avue-count-up>
+                                <avue-count-up :end="forms.unpaidAmount"></avue-count-up>
                             </div>
                             <div class="title">未收款</div>
                         </div>
@@ -65,7 +65,7 @@
                         <div class="stat-tip">
                             <div class="money">
                                 <span style="font-size:20px;">￥</span>
-                                <avue-count-up :end="form.settlmentAmount"></avue-count-up>
+                                <avue-count-up :end="forms.paidAmount"></avue-count-up>
                             </div>
                             <div class="title">已收款</div>
                         </div>
@@ -177,12 +177,20 @@ export default {
             loading: false,
             loading2: false,
             form: {
+                paidAmount:0,
+                totalAmount:0,
+                unpaidAmount:0,
                 debitAmount: 0,
                 deliveringAmount: 0,
                 advancePayment: 0,
                 balanceAmount: 0,
                 settlmentAmount: 0
             },
+            forms:{
+                paidAmount:0,
+                totalAmount:0,
+                unpaidAmount:0,
+            },
             page: {
                 pageSize: 10,
                 currentPage: 1,
@@ -304,6 +312,8 @@ export default {
             this.getDetail(this.detailData.id);
         }
         this.getAllWorkDicts()
+        this.$refs.crud.dicInit()
+        this.$refs.crud2.dicInit()
     },
     methods: {
         getAllWorkDicts() {
@@ -361,7 +371,7 @@ export default {
             console.log(data);
             //id: id, status: '待确认,待发货,已发货,退款请核', bsType: 'XS' 
             data.status = '待确认,待发货,已发货,退款请核'
-            getList({ id: this.detailData.id, status: '待确认,待发货,已发货,退款请核', bsType: 'XS' })
+            getList({ customerId: this.detailData.id, status: '待确认,待发货,已发货,退款请核', bsType: 'XS' })
                 .then(res => {
                     this.sellList = res.data.data.records ? res.data.data.records : [];
                     this.page.total = res.data.data.total;
@@ -429,7 +439,7 @@ export default {
                 });
             pageStatistics({ id: id })
                 .then(res => {
-                    // this.form = res.data.data;
+                    this.forms = res.data.data;
                     this.corpsAddrList = res.data.data.corpsAddrList;
                 })
                 .finally(() => {

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

@@ -77,8 +77,8 @@
                 </el-button>
                 <el-button type="primary" size="mini" icon="el-icon-bottom" @click="excelBox = true">导入
                 </el-button> -->
-                <el-button type="primary" size="mini" icon="el-icon-bottom" @click="outExport">导出
-                </el-button>
+                <!-- <el-button type="primary" size="mini" icon="el-icon-bottom" @click="outExport">导出
+                </el-button> -->
               </template>
               <template slot-scope="{ row, index }" slot="cname">
                 <span style="color: #409EFF;cursor: pointer" @click.stop="viewInfo(row)">{{ row.cname }}
@@ -550,6 +550,7 @@
         this.detailData = this.$options.data().detailData;
         this.show = true;
         this.showInfo = true;
+        this.$refs.crud.refreshTable();
         this.onLoad(this.page, this.search);
       },
     }

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

@@ -45,7 +45,7 @@ export const option = {
     },
     {
       label: "实际数量",
-      prop: "deliveringAmount",
+      prop: "number",
       overHidden: true,
     },
     // {
@@ -78,12 +78,12 @@ export const option = {
     // },
     {
       label: "信用额度余额",
-      prop: "settlmentAmount",
+      prop: "creditLimitBalance",
       overHidden: true,
     },
     {
       label: "账期",
-      prop: "accountPeriodAmount",
+      prop: "accountPeriod",
       overHidden: true,
     },
     // {
@@ -390,7 +390,6 @@ export const sellOption = {
     }, {
       label: '业务对象',
       prop: "customerName",
-      search: true,
       overHidden: true,
       type: 'select',
       props: {
@@ -431,18 +430,18 @@ export const sellOption = {
       }
 
     },
-    {
-      label: "产品",
-      prop: "cname",
-      type: "select",
-      dicData: [],
-      search: true,
-      filterable: true,
-      props: {
-        label: "cname",
-        value: "cname"
-      },
-    },
+    // {
+    //   label: "产品",
+    //   prop: "cname",
+    //   type: "select",
+    //   dicData: [],
+    //   search: true,
+    //   filterable: true,
+    //   props: {
+    //     label: "cname",
+    //     value: "cname"
+    //   },
+    // },
     {
       label: "客户分类",
       prop: "corpType",
@@ -454,7 +453,7 @@ export const sellOption = {
         value: "id"
       },
       hide: true,
-      search: true,
+      // search: true,
       showColumn: false,
     },
     {
@@ -503,7 +502,7 @@ export const capitalOption = {
       overHidden: true,
     }, {
       label: "客户",
-      prop: "corpId",
+      prop: "corpName",
       search: true,
       searchOrder:3,
       type: 'select',
@@ -514,7 +513,7 @@ export const capitalOption = {
       dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=KH&enableOrNot=0',
     }, {
       label: "所属公司",
-      prop: "salesCompanyId",
+      prop: "salesCompanyName",
       search: true,
       type: 'select',
       searchOrder:6,

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

@@ -7,11 +7,11 @@
                         @click="backToList">返回列表
                     </el-button>
                 </div>
-                <div class="add-customer-btn">
+                <!-- <div class="add-customer-btn">
                     <el-button type="primary" size="small" @click="editCustomer">
                         编辑
                     </el-button>
-                </div>
+                </div> -->
             </div>
         </div>
         <containerTitle title="基础信息" style="margin-top: 60px"></containerTitle>
@@ -25,12 +25,12 @@
                         <div class="stat-tip">
                             <div class="money">
                                 <span style="font-size:20px;">￥</span>
-                                <avue-count-up :end="form.debitAmount"></avue-count-up>
+                                <avue-count-up :end="forms.totalAmount"></avue-count-up>
                             </div>
                             <div class="title">合同金额</div>
                         </div>
                     </td>
-                    <td class="stat-td">
+                    <!-- <td class="stat-td">
                         <img src="@/assets/img/deliveredBg.png" class="stat-img">
                         <div class="stat-tip">
                             <div class="money">
@@ -39,8 +39,8 @@
                             </div>
                             <div class="title">已送货</div>
                         </div>
-                    </td>
-                    <td class="stat-td">
+                    </td> -->
+                    <!-- <td class="stat-td">
                         <img src="@/assets/img/advanceCollectionBg.png" class="stat-img">
                         <div class="stat-tip">
                             <div class="money">
@@ -49,13 +49,13 @@
                             </div>
                             <div class="title">预收款</div>
                         </div>
-                    </td>
+                    </td> -->
                     <td class="stat-td">
                         <img src="@/assets/img/uncollectedBg.png" class="stat-img">
                         <div class="stat-tip">
                             <div class="money">
                                 <span style="font-size:20px;">￥</span>
-                                <avue-count-up :end="form.balanceAmount"></avue-count-up>
+                                <avue-count-up :end="forms.unpaidAmount"></avue-count-up>
                             </div>
                             <div class="title">未收款</div>
                         </div>
@@ -65,7 +65,7 @@
                         <div class="stat-tip">
                             <div class="money">
                                 <span style="font-size:20px;">￥</span>
-                                <avue-count-up :end="form.settlmentAmount"></avue-count-up>
+                                <avue-count-up :end="forms.paidAmount"></avue-count-up>
                             </div>
                             <div class="title">已收款</div>
                         </div>
@@ -183,6 +183,11 @@ export default {
                 balanceAmount: 0,
                 settlmentAmount: 0
             },
+            forms:{
+                paidAmount:0,
+                totalAmount:0,
+                unpaidAmount:0,
+            },
             page: {
                 pageSize: 10,
                 currentPage: 1,
@@ -299,11 +304,13 @@ export default {
         );
         // this.sellOption.height = window.innerHeight - 330;
         console.log(this.detailData);
+        this.$refs.crud2.dicInit()
         if (this.detailData.id) {
             console.log('this.detailData.id');
             this.getDetail(this.detailData.id);
         }
         this.getAllWorkDicts()
+        this.$refs.crud.dicInit()
     },
     methods: {
         getAllWorkDicts() {
@@ -349,19 +356,19 @@ export default {
         },
         onLoad(page, params = {}) {
             let data = this.deepClone(Object.assign(params, this.search));
-            data.billType = 'XS';
-            data.tradeType = 'YPJ';
-            if (data.businesDate) {
-                data.orderStartDate = data.businesDate[0];
-                data.orderEndDate = data.businesDate[1];
-            }
-            delete data.businesDate
-            data.corpId = this.detailData.id;
+            // data.billType = 'XS';
+            // data.tradeType = 'YPJ';
+            // if (data.businesDate) {
+            //     data.orderStartDate = data.businesDate[0];
+            //     data.orderEndDate = data.businesDate[1];
+            // }
+            // delete data.businesDate
+            // data.corpId = this.detailData.id;
             this.loading = true;
             console.log(data);
             //id: id, status: '待确认,待发货,已发货,退款请核', bsType: 'XS' 
             data.status = '待确认,待发货,已发货,退款请核'
-            getList({ id: this.detailData.id, status: '待确认,待发货,已发货,退款请核', bsType: 'CG' })
+            getList({ id: this.detailData.id, status: '待确认,待发货,已发货,退款请核', bsType: 'CG',...data })
                 .then(res => {
                     this.sellList = res.data.data.records ? res.data.data.records : [];
                     this.page.total = res.data.data.total;
@@ -429,7 +436,7 @@ export default {
                 });
             pageStatistics({ id: id })
                 .then(res => {
-                    // this.form = res.data.data;
+                    this.forms = res.data.data;
                     this.corpsAddrList = res.data.data.corpsAddrList;
                 })
                 .finally(() => {

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

@@ -77,8 +77,8 @@
                 </el-button>
                 <el-button type="primary" size="mini" icon="el-icon-bottom" @click="excelBox = true">导入
                 </el-button> -->
-              <el-button type="primary" size="mini" icon="el-icon-bottom" @click="outExport">导出
-              </el-button>
+              <!-- <el-button type="primary" size="mini" icon="el-icon-bottom" @click="outExport">导出
+              </el-button> -->
             </template>
             <template slot-scope="{ row, index }" slot="cname">
               <span style="color: #409EFF;cursor: pointer" @click.stop="viewInfo(row)">{{ row.cname }}

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

@@ -45,7 +45,7 @@ export const option = {
     },
     {
       label: "实际数量",
-      prop: "deliveringAmount",
+      prop: "number",
       overHidden: true,
     },
     // {
@@ -78,12 +78,12 @@ export const option = {
     // },
     {
       label: "信用额度余额",
-      prop: "settlmentAmount",
+      prop: "creditLimitBalance",
       overHidden: true,
     },
     {
       label: "账期",
-      prop: "accountPeriodAmount",
+      prop: "accountPeriod",
       overHidden: true,
     },
     // {
@@ -395,7 +395,7 @@ export const sellOption = {
       type: 'select',
       props: {
         label: 'cname',
-        value: 'id'
+        value: 'cname'
       },
       dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=GYS&enableOrNot=0',
     }, {
@@ -406,7 +406,7 @@ export const sellOption = {
       type: 'select',
       props: {
         label: 'cname',
-        value: 'id'
+        value: 'cname'
       },
       dicUrl: '/api/blade-sales-part/storageDesc/listAll',
     }, {
@@ -482,7 +482,7 @@ export const capitalOption = {
       overHidden: true,
     }, {
       label: "客户",
-      prop: "corpId",
+      prop: "corpName",
       search: true,
       searchOrder:3,
       type: 'select',
@@ -493,7 +493,7 @@ export const capitalOption = {
       dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=KH&enableOrNot=0',
     }, {
       label: "所属公司",
-      prop: "salesCompanyId",
+      prop: "salesCompanyName",
       search: true,
       type: 'select',
       searchOrder:6,