修改bug

src/components/bill/selectOrderDetailList.vue

@@ -162,7 +162,7 @@ export default {
         params.type = "CMY"
       }
       params.flag = this.flag
-        if (this.params.bsType == 'XS') {
+        if (this.params.bsType == 'XS,TKXS') {
             params.settlementType = 'd'
         }else {
             params.settlementType = 'c'

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

@@ -46,26 +46,29 @@
                     </template>
                     <template slot="whetherIntegral" slot-scope="{disabled}">
                         <!--<el-switch v-model="form.whetherIntegral" active-text="是" inactive-text="否" active-value="1" inactive-value="0" @change="whetherChange"/>-->
-                        <el-switch v-model="form.whetherIntegral" :disabled="disabled" active-text="是"
-                                   inactive-text="否" active-value="1" inactive-value="0" />
+                        <el-switch v-model="form.whetherIntegral" :disabled="disabled" active-text="是" inactive-text="否"
+                            active-value="1" inactive-value="0" />
                     </template>
 
                     <template slot="explosionProof" slot-scope="{disabled}">
                         <!--<el-switch v-model="form.explosionProof" :disabled="disabled" active-text="是" inactive-text="否"-->
                         <!--    active-value="1" inactive-value="0" />-->
                         <!--<el-radio v-model="form.explosionProof"></el-radio>-->
-                        <el-checkbox v-model="form.explosionProof" :checked="form.explosionProof == 1" :true-label="1" :false-label="0"></el-checkbox>
+                        <el-checkbox v-model="form.explosionProof" :checked="form.explosionProof == 1" :true-label="1"
+                            :false-label="0"></el-checkbox>
                     </template>
 
                     <template slot="originalFactory" slot-scope="{disabled}">
                         <!--<el-switch v-model="form.originalFactory" :disabled="disabled" active-text="是" inactive-text="否"-->
                         <!--           active-value="1" inactive-value="0" />-->
-                        <el-checkbox v-model="form.originalFactory" :checked="form.originalFactory == 1" :true-label="1" :false-label="0"></el-checkbox>
+                        <el-checkbox v-model="form.originalFactory" :checked="form.originalFactory == 1" :true-label="1"
+                            :false-label="0"></el-checkbox>
                     </template>
                     <template slot="selfRecovery" slot-scope="{disabled}">
                         <!--<el-switch v-model="form.selfRecovery" :disabled="disabled" active-text="是" inactive-text="否"-->
                         <!--           active-value="1" inactive-value="0" />-->
-                        <el-checkbox v-model="form.selfRecovery" :checked="form.selfRecovery == 1" :true-label="1" :false-label="0"></el-checkbox>
+                        <el-checkbox v-model="form.selfRecovery" :checked="form.selfRecovery == 1" :true-label="1"
+                            :false-label="0"></el-checkbox>
                     </template>
                 </avue-form>
             </trade-card>
@@ -122,7 +125,7 @@ import {
 import { optionList } from "./js/optionList";
 import goodsType from '@/components/goodsType/index'
 import corpType from './components/index'
-import {brandfigureListAll} from "@/api/tirePartsMall/basicData/listingManagement";
+import { brandfigureListAll } from "@/api/tirePartsMall/basicData/listingManagement";
 
 export default {
     name: "index",
@@ -196,9 +199,9 @@ export default {
                             disabled: 'disabled'
                         },
                         dicUrl: '/api/blade-sales-part/brandDesc/listAllV1?type=PP&enableOrNot=1',
-                        change:(value)=>{
+                        change: (value) => {
                             if (!value.value) return
-                            brandfigureListAll({pid:value.value}).then(res=>{
+                            brandfigureListAll({ pid: value.value }).then(res => {
                                 this.findObject(this.option.column, "brandItem").dicData = res.data.data
                             })
                         },
@@ -233,9 +236,9 @@ export default {
                         prop: "brandItem",
                         span: 8,
                         type: 'select',
-                        filterable:true,
-                        allowCreate:true,
-                        dicData:[],
+                        filterable: true,
+                        allowCreate: true,
+                        dicData: [],
                         props: {
                             label: 'figure',
                             value: 'figure',
@@ -282,7 +285,7 @@ export default {
                             label: 'fullName',
                             value: 'id'
                         },
-                        display:false,
+                        display: false,
                         rules: [{
                             required: true,
                             message: " ",
@@ -478,7 +481,7 @@ export default {
                             label: '是',
                             value: 1
                         }],
-                    },{
+                    }, {
                         label: "是否管理批次号",
                         prop: "whether",
                         labelWidth: 120,
@@ -704,7 +707,7 @@ export default {
                     type: "success",
                     message: val ? '启用成功' : '禁用成功'
                 });
-                this.getDetail(this.detailData.id);
+
                 if (val == 0) {
                     console.log('禁用中');
                     this.option.disabled = false;
@@ -712,6 +715,8 @@ export default {
                         this.$set(item, 'disabled', false)
                     }
                 }
+                console.log('执行getdetail')
+                this.getDetail(this.form.id);
             })
         },
         saveGoodstype() {
@@ -719,6 +724,7 @@ export default {
                 done();
                 if (valid) {
                     goodsTypesubmit({ ...this.form2, status: 0 }).then(res => {
+                        this.getDetail(res.data.data.id)
                         this.getAllWorkDicts()
                     })
                     this.goodsTypeVisible = false
@@ -758,7 +764,7 @@ export default {
                 // this.data = res.data.data.stockGoodsList;
                 this.filesList = res.data.data.goodsFilesList
                 // 把详情得到的主图附图状态从数值型转化成字符串型
-                for(let item of this.filesList) {
+                for (let item of this.filesList) {
                     item.mainImage = item.mainImage + ''
                 }
                 this.whetherChange(res.data.data.whether)
@@ -780,10 +786,10 @@ export default {
                     for (let item of this.option.column) {
                         this.$set(item, 'disabled', false)
                     }
-                }else{
-                  for (let item of this.option.column) {
-                    this.$set(item, 'disabled', true)
-                  }
+                } else {
+                    for (let item of this.option.column) {
+                        this.$set(item, 'disabled', true)
+                    }
                 }
                 this.key++
             }).finally(() => {
@@ -908,5 +914,4 @@ export default {
         font-weight: 600;
         text-align: center;
     }
-}
-</style>
+}</style>

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

@@ -415,7 +415,7 @@ export default {
       this.params = {
         customerId: this.form.corpId,
         generateTask: '已生成',
-        bsType: 'XS',
+        bsType: 'XS,TKXS',
         actualPaymentStatus: '2'
       }
       this.billDetailDialog = true;

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

@@ -345,7 +345,7 @@ export default {
       this.params = {
         customerId: this.form.corpId,
         status: '待确认',
-        bsType: 'CG',
+        bsType: 'CG,TKCG',
         actualPaymentStatus: '2'
       }
         this.billDetailDialog = true;

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

@@ -134,6 +134,7 @@ export default {
                 businesDateStart: defaultDate3()[0],
                 businesDateEnd: defaultDate3()[1],
                 isContain: 1,
+                bsType:'CG,TKCG',
             },
             page: {
                 pageSize: 10,
@@ -377,7 +378,7 @@ export default {
         },
         //导出
         outExport() {
-            let config = {params: {...this.query}}
+            let config = {params: {bsType:'CG,TKCG',...this.query}}
             if (config.params) {
                 for (const propName of Object.keys(config.params)) {
                     const value = config.params[propName];

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

@@ -133,6 +133,7 @@ export default {
             query: {
                 businesDateStart: defaultDate3()[0],
                 businesDateEnd: defaultDate3()[1],
+                bsType: 'XS,TKXS',
                 isContain: 1,
             },
             page: {
@@ -164,11 +165,6 @@ export default {
                         decimals: 0
                     },
                     {
-                        name: 'price',
-                        type: 'sum',
-                        decimals: 2
-                    },
-                    {
                         name: 'subTotalMoney',
                         type: 'sum',
                         decimals: 2
@@ -368,7 +364,7 @@ export default {
         },
         //导出
         outExport() {
-            let config = {params: {...this.query}}
+            let config = {params: {bsType:'XS,TKXS',...this.query}}
             if (config.params) {
                 for (const propName of Object.keys(config.params)) {
                     const value = config.params[propName];
@@ -449,6 +445,7 @@ export default {
                 bsType:'XS,TKXS',
                 ...Object.assign(params, this.query)
             }
+            console.log(queryParams)
             statisticsSaleDetail(queryParams).then(res => {
                 this.data = res.data.data.records
                 this.page.total = res.data.data.total

src/views/tirePartsMall/purchaseService/outStorage/detailsPage.vue

@@ -334,24 +334,10 @@ export default {
             value: "dot"
           },
           dicUrl: "/api/blade-sales-part/stockDesc/dotList",
-        }, {
-          label: '单位',
-          prop: 'units',
-          type: "select",
-          disabled: true,
-          props: {
-            label: "dictValue",
-            value: "dictValue"
-          },
-          dicUrl: "/api/blade-system/dict-biz/dictionary?code=unit"
-        }, {
-            label: '库存',
-            prop: 'inventory',
         },{
           label: '出库数量',
           prop: 'goodsNum',
           disabled: false,
-          disabled: true,
         }, {
           label: '发货数量',
           prop: 'sendNum',

src/views/tirePartsMall/purchaseService/returns/index.vue

@@ -182,6 +182,7 @@ export default {
           {
             label: '采购单号',
             prop: "srcNo",
+            search: true,
             overHidden: true,
           },
           {

src/views/tirePartsMall/salesService/returns/index.vue

@@ -176,6 +176,7 @@ export default {
           {
             label: '销售单号',
             prop: "srcNo",
+            search: true,
             overHidden: true,
           },
           {