轮胎商城9.11更改内容

src/api/tirePartsMall/salesManagement/saleOrder.js

@@ -165,7 +165,14 @@ export const skgetKh = () => {
     method: 'get',
   })
 }
-
+// 采购入库里的业务对象
+export const corpsDescListAll = (data) => {
+  return request({
+    url: '/api/blade-sales-part/corpsDesc/listAll',
+    method: 'get',
+    params:data
+  })
+}
 //收款账户下拉
 export const getSk = () => {
   return request({

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

@@ -122,6 +122,7 @@ import { dateFormat } from "@/util/date";
 import { getToken } from "@/util/auth";
 import { getMenu } from "@/api/system/menu";
 import reportDialog from "@/components/report-dialog/main";
+import {corpsDescListAll} from "@/api/tirePartsMall/salesManagement/saleOrder";
 export default {
     name: "detailsPage",
     data() {
@@ -188,14 +189,21 @@ export default {
                             label: 'cname',
                             value: 'id'
                         },
-                        dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=GYS',
+                        dicData: [],
                         rules: [
                             {
                                 required: true,
                                 message: " ",
                                 trigger: "blur"
                             }
-                        ]
+                        ],
+                        change:({ value, column }) => {
+                            if (this.form.billno.indexOf('TK') != -1) {
+                                this.corpsDescListAllfun('KH')
+                            }else {
+                                this.corpsDescListAllfun('GYS')
+                            }
+                        }
                     },
                     {
                         label: "仓库",
@@ -319,6 +327,7 @@ export default {
                 dialogWidth: "80%",
                 showSummary: true,
 
+
                 saveBtn:false, // 表格弹窗保存按钮
                 cancelBtn:false, // 行内查看取消按钮
                 cellBtn:true, // 行编辑
@@ -647,13 +656,11 @@ export default {
         }
         if (!this.form.id) {
             this.isEdit = true
-            console.log('这是一还是二');
             // this.$set(this.optionContactsBack, "addBtn", false)
             this['optionContacts'] = this['optionContactsBack'];
             this.delColumnData(this.getColumnName('269.1'), this['optionContactsBack']);
         }
         if (!this.onLoad.id) {
-            console.log(3);
             this.isrowAdd = false
             this.isEdit = false
             // this.$set(this.optionForm,'disabled',false)
@@ -867,8 +874,6 @@ export default {
                 spinner: 'el-icon-loading',
                 background: 'rgba(255,255,255,0.7)'
             })
-            console.log(id,847)
-            console.log(this.detailData.id,848)
             if (!this.detailData.id) {
                 getDetails({ id: id }).then(res => {
                     this.form = res.data.data
@@ -887,6 +892,12 @@ export default {
                 })
             }
         },
+        // 获取业务对象
+        corpsDescListAllfun(corpType){
+            corpsDescListAll({corpType}).then(res=>{
+                this.optionForm.column[0].dicData = res.data.data
+            })
+        },
         //编辑
         rowEdit(row, index) {
             console.log(row, index,887);

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

@@ -50,6 +50,7 @@ import { getList, remove, getWarehouseKeeper, getGoodsInfo } from "@/api/tirePar
 import detailsPage from "./detailsPage.vue"
 import { dateFormat } from '@/util/date'
 import { getDetails } from "@/api/tirePartsMall/purchasingManagement/warehouseEntryOrder";
+import {corpsDescListAll} from "@/api/tirePartsMall/salesManagement/saleOrder";
 export default {
   name: "index",
   components: {
@@ -67,7 +68,7 @@ export default {
       dataList: [],
       detailData: {},
       page: {
-        pageSize: 20,
+        pageSize: 10,
         currentPage: 1,
         total: 0,
         pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
@@ -222,7 +223,8 @@ export default {
             label: 'cname',
             value: 'id'
           },
-          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=GYS',
+            dicData: [],
+          // dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=GYS',
         }, {
           label: "仓库",
           prop: "storageName",
@@ -380,6 +382,7 @@ export default {
       };
       this.detailsOpen = true;
     }
+    this.corpsDescListAllfun()
   },
   activated(){
     // if (this.$route.query.id) {
@@ -432,6 +435,12 @@ export default {
       done();
       this.onLoad(this.page, params)
     },
+      // 获取业务对象
+      corpsDescListAllfun(){
+          corpsDescListAll({corpType:'GYS,KH'}).then(res=>{
+              this.findObject(this.option.column, "customerId").dicData = res.data.data
+          })
+      },
     onLoad(page, params = {}) {
       let storageId = this.search.storageName;
       let searchWithoutStorageName = { ...this.search };
@@ -457,6 +466,12 @@ export default {
         if (res.data.data.records) {
           res.data.data.records.forEach(e => {
             e.itemLoading = true;
+              this.findObject(this.option.column, "customerId").dicData.map(item=>{
+                  if (e.customerId == item.id) {
+                      e.customerName = item.cname
+                  }
+              })
+
           });
         }
         this.dataList = res.data.data.records

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

@@ -1151,7 +1151,6 @@ export default {
     methods: {
         // 获取明细信息
         getDetailsfun(){
-            console.log(this.detailData.id,1128)
             getDetails({
                 id:this.detailData.id
             }).then(res=>{

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

@@ -348,31 +348,31 @@ export default {
             dataList: [],
             dicUrlWithCustomId: '',
             sharedCompanyId: 0,
-            isAddBtn: true,
-            isSaveBtn: false,
-            viewDisabled: false,
-            isAdd: false,
-            editButton: true,
-            isEditButton: false,
+            isAddBtn: true, // 添加轮胎的是否禁用
+            isSaveBtn: false, // 大保存的是否禁用
+            viewDisabled: false, // 大审批的是否禁用
+            isAdd: false, // 表格按钮的是否点击
+            editButton: true, // 大编辑大隐藏显示
+            isEditButton: false, // 大编辑是否禁用
             goods: [],
-            isDisabled: false,
-            isDisabledTask: false,
+            isDisabled: false, // 表格删除的是否禁用
+            isDisabledTask: false, // 撤销任务和生成任务的是否禁用
             contactsOption: [],
-            isContacts: false,
+            isContacts: false, // 表单的联系人是否禁用
             checkData: {},
-            buttonText: '生成任务',
-            buttonColor: 'success', // 初始颜色为success
-            checkScheduleDialog: false,
-            isApplySettlement: true,
-            isConfirmRefundBtn: true,
-            isExamineBtn: true,
-            isRevocationRequest: true,
-            checkDialog: false,
+            buttonText: '生成任务',  // 生成任务和撤销任务文本
+            buttonColor: 'success', // 初始颜色为success  生成任务和撤销任务颜色状态
+            checkScheduleDialog: false,  // 审批进度的弹窗开启关闭
+            isApplySettlement: true,  // 申请退款的是否禁用
+            isConfirmRefundBtn: true, // 确认退款的是否禁用
+            isExamineBtn: true, // 审批是否禁用
+            isRevocationRequest: true, // 撤销审核是否禁用
+            checkDialog: false, // 审核弹窗的开启关闭
             checkId: '',
             batchNo: '',
-            switchDialog: false,
+            switchDialog: false, // 打印弹窗的开启和关闭
             activeName: "sale_detail",
-            disabled: false,
+            disabled: false, // 表格按钮的禁用
             key: 0,
             form: {
                 orderItemsList: [],
@@ -1152,14 +1152,21 @@ export default {
         }
     },
     methods: {
-        // 获取明细信息
+        // 获取详细明细信息
         getDetailsfun(){
             getDetails({
                 id:this.detailData.id
             }).then(res=>{
-                console.log(res.data,1131)
                 this.form = res.data.data
                 this.form.orderItemsList = res.data.data.orderItemsList
+
+                console.log(this.isEditButton,'bianj')
+                console.log(this.isDisabledTask,'chexiao')
+                console.log(this.buttonColor,'123')
+                // if (this.form.status == '待发货') {
+                //
+                // }
+
             })
         },
         // 获取左侧筛选
@@ -1423,6 +1430,7 @@ export default {
             }
             if (this.form.status == '待发货') {
                 this.isAddBtn = true
+
             }
             this.optionContactsBack.column.forEach(its => {
                 if (its.prop == 'goodsId' || its.prop == 'goodsNum' || its.prop == 'price' || its.prop == 'dot' || its.prop == 'remarks') {
@@ -1549,6 +1557,7 @@ export default {
                     this.isContacts = true
                     //删除按钮
                     this.isDisabled = false
+
                     // this.optionForm.column.forEach(item => {
                     //     item.disabled = false
                     // })
@@ -1583,6 +1592,8 @@ export default {
                     this.isDisabledTask = false;
                     this.viewDisabled = false;
                     this.isDisabled = true
+
+                    this.isAdd = true
                 }
                 // this.$set(this.form, 'shipType', '物流')
                 // this.$set(this.form, 'receivableType', '现金')
@@ -1650,6 +1661,7 @@ export default {
                                         this.isAdd = true
                                         this.isDisabled = true
                                         this.isAddBtn = true
+                                        this.editButton = true // 把编辑按钮显示出来
                                     }).finally(() => {
                                         loading.close();
                                     });
@@ -1694,6 +1706,7 @@ export default {
                                 this.$set(this.optionContactsBack, 'disabled', true)
                                 this.isContacts = true
                                 this.isDisabled = true
+                                this.editButton = true // 把编辑按钮显示出来
                                 //添加删除按钮禁用
                                 this.isAdd = true
                                 if (this.form.businessSource == "外部销售") {
@@ -1795,6 +1808,7 @@ export default {
                         this.refresh(res.data.data.id)
                         this.isDisabledTask = false
                         this.editButton = true
+
                         loading.close();
                     }).finally(() => {
                         loading.close();

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

@@ -143,19 +143,21 @@ export default {
           overHidden: true,
         }, {
           label: '业务日期',
-          prop: "createTime",
-          searchProp: "createTimeList",
-          type: "date",
+          prop: "businesDateList",
+          // searchProp: "businesDateList",
+          type: "monthrange",
+          format: "yyyy-MM",
+          valueFormat: "yyyy-MM",
+          unlinkPanels: true,
+          searchRange: true,
           overHidden: true,
           search: true,
           hide: true,
-          showColumn: false,
-          search: true,
+          // showColumn: false,
           width: 100,
-          searchRange: true,
-          searchDefaultTime: ["00:00:00", "23:59:59"],
-          format: "yyyy-MM-dd HH:mm:ss",
-          valueFormat: "yyyy-MM-dd HH:mm:ss"
+          // searchDefaultTime: ["00:00:00", "23:59:59"],
+          // format: "yyyy-MM-dd HH:mm:ss",
+          // valueFormat: "yyyy-MM-dd HH:mm:ss"
         }, {
           label: '期末',
           prop: "closingAmount",