Qukatie 11 mesiacov pred
rodič
commit
e5dc7a8123
26 zmenil súbory, kde vykonal 250 pridanie a 63 odobranie
  1. 162 38
      src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue
  2. 1 0
      src/views/paymentManagement/paymentRecord/index.vue
  3. 1 0
      src/views/tirePartsMall/basicData/RotationChart/index.vue
  4. 1 0
      src/views/tirePartsMall/basicData/brandPage/index.vue
  5. 1 0
      src/views/tirePartsMall/basicData/equipmentService/index.vue
  6. 1 0
      src/views/tirePartsMall/financialManagement/collectionSettlement/index.vue
  7. 1 0
      src/views/tirePartsMall/financialManagement/paymentSettlement/index.vue
  8. 2 0
      src/views/tirePartsMall/financingManagement/balanceRecharge/index.vue
  9. 1 1
      src/views/tirePartsMall/financingManagement/financingManagement/index.vue
  10. 1 0
      src/views/tirePartsMall/purchaseService/Task/index.vue
  11. 1 0
      src/views/tirePartsMall/purchaseService/outStorage/index.vue
  12. 1 0
      src/views/tirePartsMall/purchaseService/returns/index.vue
  13. 1 0
      src/views/tirePartsMall/purchasingManagement/financingProcurement/index.vue
  14. 1 0
      src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/index.vue
  15. 1 0
      src/views/tirePartsMall/salesManagement/Inventory/index.vue
  16. 1 0
      src/views/tirePartsMall/salesManagement/inboundTask/index.vue
  17. 1 0
      src/views/tirePartsMall/salesManagement/outboundTask/index.vue
  18. 1 0
      src/views/tirePartsMall/salesManagement/outboundWorkOrder/index.vue
  19. 1 0
      src/views/tirePartsMall/salesManagement/outboundWorkOrderL/index.vue
  20. 1 1
      src/views/tirePartsMall/salesManagement/purchaseOrder/index.vue
  21. 62 23
      src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue
  22. 2 0
      src/views/tirePartsMall/salesManagement/saleOrder/index.vue
  23. 1 0
      src/views/tirePartsMall/salesService/Task/index.vue
  24. 1 0
      src/views/tirePartsMall/salesService/inStorage/index.vue
  25. 1 0
      src/views/tirePartsMall/salesService/returns/index.vue
  26. 1 0
      src/views/tirePartsMall/statisticAnalysis/salesReconciliation/index.vue

+ 162 - 38
src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -93,14 +93,14 @@
                     <span>{{ row.accStatus ? '是' : '否' }}</span>
                 </template>
                 <template slot="corpCnName" slot-scope="{ row }">
-                    <search-query v-if="row.edit" :datalist="corpCnNameData" :selectValue="row.corpCnName"
-                        :filterable="true" :clearable="true" :remote="true" :buttonIf="false"
-                        :forParameter="{ key: 'id', label: 'shortName', value: 'cnName' }"
-                        @remoteMethod="getBcorpsListfun($event, 'corpCnName')"
-                        @corpChange="corpChange($event, 'corpCnName', row, 'D')"
-                        @corpFocus="getBcorpsListfun($event, 'corpCnName')">
+                    <search-query v-if="row.edit" :datalist="corpCnNameData" :selectValue="row.shortName" :filterable="true"
+                        :clearable="true" :remote="true" :buttonIf="false"
+                        :forParameter="{ key: 'id', label: 'shortName', value: 'shortName' }"
+                        @remoteMethod="getBcorpsListfun($event, 'shortName')"
+                        @corpChange="corpChange($event, 'shortName', row, 'D')"
+                        @corpFocus="getBcorpsListfun($event, 'shortName')">
                     </search-query>
-                    <span v-else style="color: #1e9fff" @click="corpClick(row)">{{ getKeyName(row.corpCnName) }}</span>
+                    <span v-else style="color: #1e9fff" @click="corpClick(row)">{{ row.shortName }}</span>
                 </template>
                 <template slot="feeCnName" slot-scope="{ row }">
                     <search-query v-if="row.edit" :datalist="feeCnNameData" :selectValue="row.feeCnName" :filterable="true"
@@ -224,14 +224,14 @@
                     <span>{{ row.accStatus ? '是' : '否' }}</span>
                 </template>
                 <template slot="corpCnName" slot-scope="{ row }">
-                    <search-query v-if="row.edit" :datalist="corpCnNameData" :selectValue="row.corpCnName"
-                        :filterable="true" :clearable="true" :remote="true" :buttonIf="false"
-                        :forParameter="{ key: 'id', label: 'shortName', value: 'cnName' }"
-                        @remoteMethod="getBcorpsListfun($event, 'corpCnName')"
-                        @corpChange="corpChange($event, 'corpCnName', row, 'C')"
-                        @corpFocus="getBcorpsListfun($event, 'corpCnName')">
+                    <search-query v-if="row.edit" :datalist="corpCnNameData" :selectValue="row.shortName" :filterable="true"
+                        :clearable="true" :remote="true" :buttonIf="false"
+                        :forParameter="{ key: 'id', label: 'shortName', value: 'shortName' }"
+                        @remoteMethod="getBcorpsListfun($event, 'shortName')"
+                        @corpChange="corpChange($event, 'shortName', row, 'C')"
+                        @corpFocus="getBcorpsListfun($event, 'shortName')">
                     </search-query>
-                    <span v-else style="color: #1e9fff" @click="corpClick(row)">{{ getKeyName(row.corpCnName) }}</span>
+                    <span v-else style="color: #1e9fff" @click="corpClick(row)">{{ row.shortName }}</span>
                 </template>
                 <template slot="feeCnName" slot-scope="{ row }">
                     <search-query v-if="row.edit" :datalist="feeCnNameData" :selectValue="row.feeCnName" :filterable="true"
@@ -302,20 +302,19 @@
                 </template>
             </avue-crud>
         </el-card>
+        <avue-crud id="out-table" :option="sumOption" :data="sumData"></avue-crud>
         <!--有admin 显示,有收和付各一个也显示出来-->
         <div v-if="roleName.indexOf('admin') != -1 || ((roleName.indexOf('应收修改') != -1 || roleName.indexOf('应收查看') != -1) && (roleName.indexOf('应付修改') != -1 || roleName.indexOf('应付查看') != -1))"
             style="display: flex;align-items: center;justify-content: space-around">
             <div style="width: 30%">
                 <div class="bottomFlex" style="justify-content: space-around">
-                    <div style="text-align: center">
-                        <div class="weightfont">¥</div>
-                        <div>CNY</div>
-                    </div>
                     <div>
                         <div style="color: #81B337">
                             <span>应收:</span>
                             <span class="weightnum">¥{{ assemblyForm.amountDr }}元</span>
                         </div>
+                    </div>
+                    <div>
                         <div style="color: #6BBCD1">
                             <span>应付:</span>
                             <span class="weightnum">¥{{ assemblyForm.amountCr }}元</span>
@@ -329,15 +328,13 @@
             </div>
             <div style="width: 30%">
                 <div class="bottomFlex" style="justify-content: space-around">
-                    <div style="text-align: center">
-                        <div class="weightfont">$</div>
-                        <div>USD</div>
-                    </div>
                     <div>
                         <div style="color: #81B337">
                             <span>应收:</span>
                             <span class="weightnum">${{ assemblyForm.amountDrUsd }}元</span>
                         </div>
+                    </div>
+                    <div>
                         <div style="color: #6BBCD1">
                             <span>应付:</span>
                             <span class="weightnum">${{ assemblyForm.amountCrUsd }}元</span>
@@ -351,15 +348,14 @@
             </div>
             <div style="width: 30%">
                 <div class="bottomFlex" style="justify-content: space-around">
-                    <div style="text-align: center">
-                        <div class="weightfont">¥</div>
-                        <div>CNY合计</div>
-                    </div>
                     <div>
                         <div style="color: #81B337">
                             <span>应收:</span>
                             <span class="weightnum">¥{{ assemblyForm.amountDrLoc }}元</span>
                         </div>
+
+                    </div>
+                    <div>
                         <div style="color: #6BBCD1">
                             <span>应付:</span>
                             <span class="weightnum">¥{{ assemblyForm.amountCrLoc }}元</span>
@@ -535,6 +531,47 @@ export default {
     },
     data() {
         return {
+            sumData: [],
+            sumOption: {
+                border: true,
+                align: 'center',
+                menuAlign: 'center',
+                menu: false,
+                header: false,
+                addBtn: false,
+                // height: '100px',
+                column: [
+                    {
+                        label: '客户',
+                        prop: 'corpCnName',
+                        overHidden: true,
+                    }, {
+                        label: 'RMB应收',
+                        prop: 'rmbD',
+                        overHidden: true,
+                    }, {
+                        label: 'RMB应付',
+                        prop: 'rmbC',
+                        overHidden: true,
+                    }, {
+                        label: 'USD应收',
+                        prop: 'usdD',
+                        overHidden: true,
+                    }, {
+                        label: 'USD应付',
+                        prop: 'usdC',
+                        overHidden: true,
+                    }, {
+                        label: '合计应收',
+                        prop: 'sumD',
+                        overHidden: true,
+                    }, {
+                        label: '合计应付',
+                        prop: 'sumC',
+                        overHidden: true,
+                    }
+                ]
+            },
             reportOption: {
                 nodeKey: "id",
                 addBtn: false,
@@ -576,8 +613,8 @@ export default {
                     {
                         label: "币别",
                         prop: "curCode",
-                        width:100,
-                        cell:true,
+                        width: 100,
+                        cell: true,
                         type: 'select',
                         dicData: [{
                             label: '全部',
@@ -1085,6 +1122,69 @@ export default {
         console.log()
     },
     methods: {
+        getSum() {
+            let sumArr = []
+            let corpArr = []
+            let newArr = []
+            this.sumData = []
+            sumArr = this.assemblyForm.feeCenterListD.concat(this.assemblyForm.feeCenterListC)
+            sumArr.forEach(e => {
+                if (e.shortName) {
+                    corpArr.push(e.shortName)
+                }
+            })
+            newArr = [... new Set(corpArr)]
+            console.log(sumArr)
+            newArr.forEach(e => {
+                let rmbD = 0
+                let rmbC = 0
+                let usdD = 0
+                let usdC = 0
+                let sumD = 0
+                let sumC = 0
+                sumArr.forEach(item => {
+                    if (e == item.shortName) {
+                        if (item.curCode == 'CNY' && item.dc == 'D') {
+                            rmbD += Number(item.rmbAmount)
+                            sumD += Number(item.rmbAmount)
+                        }
+                        if (item.curCode == 'CNY' && item.dc == 'C') {
+                            rmbC += Number(item.rmbAmount)
+                            sumC += Number(item.rmbAmount)
+                        }
+                        if (item.curCode == 'USD' && item.dc == 'D') {
+                            usdD += Number(item.usdAmount)
+                            sumD += Number(item.usdAmount) * Number(item.exrate)
+                        }
+                        if (item.curCode == 'USD' && item.dc == 'C') {
+                            usdC += Number(item.usdAmount)
+                            sumC += Number(item.usdAmount) * Number(item.exrate)
+                        }
+                    }
+                })
+                this.sumData.push({
+                    corpCnName: e,
+                    rmbD: rmbD,
+                    rmbC: rmbC,
+                    usdD: usdD,
+                    usdC: usdC,
+                    sumD: sumD,
+                    sumC: sumC
+                })
+            })
+        },
+        uniqueItems(list) {
+            const unique = [];
+            const seen = new Set();
+            for (const item of list) {
+                const key = item.id; // 假设根据id属性去重
+                if (!seen.has(key)) {
+                    seen.add(key);
+                    unique.push(item);
+                }
+            }
+            return unique;
+        },
         getKeyName(key) {
             const item = this.corpCnNameData.find(item => item.cnName === key);
             return item ? item.shortName : key;
@@ -1112,7 +1212,7 @@ export default {
                 reportCode: this.reportformsObj.classifyCode,
                 groupCode: this.reportformsObj.groupCode,
                 corpIds: row.id,
-                curCode:row.curCode,
+                curCode: row.curCode,
                 type: 'HYCK'
             }).then(res => {
                 this.handleReportPreview(this.reportformsObj.url, res.data.data.data)
@@ -1173,7 +1273,7 @@ export default {
                     this.printingLoading = false
                     res.data.data.forEach(e => {
                         e.$cellEdit = true
-                        e.curCode=null
+                        e.curCode = null
                     })
                     this.PrintingData = res.data.data
                 })
@@ -1394,9 +1494,9 @@ export default {
                 // obj.usdAmountNet = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].usdAmountNet
             } else {
                 // 往来单位拿主表客户名称
-                // obj.corpId = this.assemblyForm.corpId
-                // obj.corpCnName = this.assemblyForm.corpCnName.split(' - ')[0]
-                // obj.corpEnName = this.assemblyForm.corpEnName
+                obj.corpId = this.assemblyForm.corpId
+                obj.corpCnName = this.assemblyForm.corpCnName.split(' - ')[0]
+                obj.corpEnName = this.assemblyForm.corpEnName
                 // 预付/到付
                 obj.paymode = this.assemblyForm.mpaymode
             }
@@ -1468,9 +1568,9 @@ export default {
                 // obj.usdAmountNet = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].usdAmountNet
             } else {
                 // 往来单位拿主表客户名称
-                // obj.corpId = this.assemblyForm.corpId
-                // obj.corpCnName = this.assemblyForm.corpCnName.split(' - ')[0]
-                // obj.corpEnName = this.assemblyForm.corpEnName
+                obj.corpId = this.assemblyForm.corpId
+                obj.corpCnName = this.assemblyForm.corpCnName.split(' - ')[0]
+                obj.corpEnName = this.assemblyForm.corpEnName
                 // 预付/到付
                 obj.paymode = this.assemblyForm.mpaymode
             }
@@ -1713,14 +1813,18 @@ export default {
         },
         // 客户的回调
         async corpChange(value, name, row, dc) {
-            if (name == 'corpCnName') {
+            if (name == 'shortName') {
+                console.log(value, name)
                 if (!value) {
+                    this.$set(row, 'shortName', '')
                     this.$set(row, 'corpCnName', '')
                     this.$set(row, 'corpEnName', '')
                     this.$set(row, 'corpId', '')
                 }
                 for (let item of this.corpCnNameData) {
-                    if (item.cnName == value) {
+                    if (item.shortName == value) {
+                        console.log(item)
+                        this.$set(row, 'shortName', item.shortName)
                         this.$set(row, 'corpCnName', item.cnName)
                         this.$set(row, 'corpEnName', item.enName)
                         this.$set(row, 'corpId', item.id)
@@ -2545,6 +2649,26 @@ export default {
         },
 
     },
+    watch: {
+        // 监听业务类型 如果不是分单 可以编辑分单号
+        'assemblyForm.feeCenterListD': {
+            // 执行方法
+            handler(oldValue, newValue) {
+                this.getSum()
+            },
+            deep: true, // 深度监听
+            immediate: true  // 第一次改变就执行
+        },
+        // 监听箱信息数据 箱信息中有温度 自动切换 冻货
+        'assemblyForm.feeCenterListC': {
+            // 执行方法
+            handler(oldValue, newValue) {
+                this.getSum()
+            },
+            deep: true, // 深度监听
+            immediate: true  // 第一次改变就执行,
+        }
+    },
 }
 </script>
 

+ 1 - 0
src/views/paymentManagement/paymentRecord/index.vue

@@ -116,6 +116,7 @@ export default {
             overHidden: true,
             width: 200,
             search:true,
+            unlinkPanels: true,
             searchRange: true,
             searchDefaultTime: ["00:00:00", "23:59:59"],
             format: "yyyy-MM-dd",

+ 1 - 0
src/views/tirePartsMall/basicData/RotationChart/index.vue

@@ -114,6 +114,7 @@ export default {
           overHidden: true,
           width: 100,
           searchRange: true,
+          unlinkPanels: true,
           searchDefaultTime: ["00:00:00", "23:59:59"],
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss"

+ 1 - 0
src/views/tirePartsMall/basicData/brandPage/index.vue

@@ -118,6 +118,7 @@ export default {
           overHidden: true,
           width: 100,
           searchRange: true,
+          unlinkPanels: true,
           searchDefaultTime: ["00:00:00", "23:59:59"],
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss"

+ 1 - 0
src/views/tirePartsMall/basicData/equipmentService/index.vue

@@ -114,6 +114,7 @@ export default {
           overHidden: true,
           width: 100,
           searchRange: true,
+          unlinkPanels: true,
           searchDefaultTime: ["00:00:00", "23:59:59"],
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss"

+ 1 - 0
src/views/tirePartsMall/financialManagement/collectionSettlement/index.vue

@@ -118,6 +118,7 @@ export default {
             overHidden: true,
             width: 100,
             searchRange: true,
+            unlinkPanels: true,
             searchDefaultTime: ["00:00:00", "23:59:59"],
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss"

+ 1 - 0
src/views/tirePartsMall/financialManagement/paymentSettlement/index.vue

@@ -117,6 +117,7 @@ export default {
             searchOrder:2,
             width: 100,
             searchRange: true,
+            unlinkPanels: true,
             searchDefaultTime: ["00:00:00", "23:59:59"],
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss"

+ 2 - 0
src/views/tirePartsMall/financingManagement/balanceRecharge/index.vue

@@ -132,6 +132,7 @@ export default {
             search: true,
             overHidden: true,
             searchRange: true,
+            unlinkPanels: true,
             searchDefaultTime: ["00:00:00", "23:59:59"],
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss"
@@ -160,6 +161,7 @@ export default {
             search: true,
             overHidden: true,
             searchRange: true,
+            unlinkPanels: true,
             searchDefaultTime: ["00:00:00", "23:59:59"],
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss"

+ 1 - 1
src/views/tirePartsMall/financingManagement/financingManagement/index.vue

@@ -69,7 +69,7 @@ export default {
         size: "small",
         menuWidth: 50,
         searchSpan: 6,
-        searchMenuSpan: 6,
+        searchMenuSpan: 18,
         searchIcon: true,
         // expand: true,
         // expandWidth: 60,

+ 1 - 0
src/views/tirePartsMall/purchaseService/Task/index.vue

@@ -253,6 +253,7 @@ export default {
           overHidden: true,
           search: true,
           width: 100,
+          unlinkPanels: true,
           searchRange: true,
           searchDefaultTime: ["00:00:00", "23:59:59"],
           format: "yyyy-MM-dd",

+ 1 - 0
src/views/tirePartsMall/purchaseService/outStorage/index.vue

@@ -304,6 +304,7 @@ export default {
           type: "date",
           search: true,
           width: 100,
+          unlinkPanels: true,
           searchRange: true,
           searchDefaultTime: ["00:00:00", "23:59:59"],
           format: "yyyy-MM-dd",

+ 1 - 0
src/views/tirePartsMall/purchaseService/returns/index.vue

@@ -219,6 +219,7 @@ export default {
             overHidden: true,
             search: true,
             width: 100,
+            unlinkPanels: true,
             searchRange: true,
             searchDefaultTime: ["00:00:00", "23:59:59"],
             format: "yyyy-MM-dd",

+ 1 - 0
src/views/tirePartsMall/purchasingManagement/financingProcurement/index.vue

@@ -482,6 +482,7 @@ export default {
           type: "date",
           search: true,
           width: 100,
+          unlinkPanels: true,
           searchRange: true,
           searchDefaultTime: ["00:00:00", "23:59:59"],
           format: "yyyy-MM-dd",

+ 1 - 0
src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/index.vue

@@ -273,6 +273,7 @@ export default {
           overHidden: true,
           search: true,
           width: 100,
+          unlinkPanels: true,
           searchRange: true,
           searchDefaultTime: ["00:00:00", "23:59:59"],
           format: "yyyy-MM-dd",

+ 1 - 0
src/views/tirePartsMall/salesManagement/Inventory/index.vue

@@ -413,6 +413,7 @@ export default {
           overHidden: true,
           search: true,
           width: 100,
+          unlinkPanels: true,
           searchRange: true,
           searchDefaultTime: ["00:00:00", "23:59:59"],
           format: "yyyy-MM-dd",

+ 1 - 0
src/views/tirePartsMall/salesManagement/inboundTask/index.vue

@@ -255,6 +255,7 @@ export default {
           overHidden: true,
           search: true,
           width: 100,
+          unlinkPanels: true,
           searchRange: true,
           searchDefaultTime: ["00:00:00", "23:59:59"],
           format: "yyyy-MM-dd",

+ 1 - 0
src/views/tirePartsMall/salesManagement/outboundTask/index.vue

@@ -252,6 +252,7 @@ export default {
           overHidden: true,
           search: true,
           width: 100,
+          unlinkPanels: true,
           searchRange: true,
           searchDefaultTime: ["00:00:00", "23:59:59"],
           format: "yyyy-MM-dd",

+ 1 - 0
src/views/tirePartsMall/salesManagement/outboundWorkOrder/index.vue

@@ -303,6 +303,7 @@ export default {
           type: "date",
           search: true,
           width: 100,
+          unlinkPanels: true,
           searchRange: true,
           searchDefaultTime: ["00:00:00", "23:59:59"],
           format: "yyyy-MM-dd",

+ 1 - 0
src/views/tirePartsMall/salesManagement/outboundWorkOrderL/index.vue

@@ -269,6 +269,7 @@ export default {
           type: "date",
           search: true,
           width: 100,
+          unlinkPanels: true,
           searchRange: true,
           searchDefaultTime: ["00:00:00", "23:59:59"],
           format: "yyyy-MM-dd",

+ 1 - 1
src/views/tirePartsMall/salesManagement/purchaseOrder/index.vue

@@ -445,7 +445,7 @@ export default {
           overHidden: true,
           searchProp: "businesDateList",
           type: "date",
-          overHidden: true,
+          unlinkPanels: true,
           search: true,
           width: 100,
           searchRange: true,

+ 62 - 23
src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -1957,33 +1957,72 @@ export default {
                                                     bsType: "XS",
                                                     ...this.form
                                                 }).then(res => {
-                                                    this.$confirm(res.data.data, '提示', {
-                                                        confirmButtonText: '确定',
-                                                        cancelButtonText: '取消',
-                                                        type: 'warning'
-                                                    }).then(() => {
-                                                        checkOrderRW({
+                                                    if (res.data.data == true) {
+                                                        submit({
                                                             bsType: "XS",
                                                             ...this.form
                                                         }).then(res => {
-                                                            this.$message.success("提交成功");
-                                                            // 将按钮文本更改为"撤销任务"
-                                                            this.buttonText = '撤销任务';
-                                                            // 将按钮颜色更改为对应的颜色
-                                                            this.buttonColor = 'warning'; // 比如改为warning
-                                                            this.refresh(res.data.data.id)
-                                                            this.refreshs(res.data.data.id, true)
-                                                            this.isContacts = true
-                                                            this.isApplySettlement = false
-                                                            this.isAdd = true
-                                                            this.isDisabled = true
-                                                            this.isAddBtn = true
-                                                            this.isDisabledTask = true
-                                                            this.editButton = true
-                                                        }).finally(() => {
+                                                            // this.refresh(res.data.data.id)
+                                                            this.isDisabledTask = false
+                                                            const loading = this.$loading({
+                                                                lock: true,
+                                                                text: '加载中',
+                                                                spinner: 'el-icon-loading',
+                                                                background: 'rgba(255,255,255,0.7)'
+                                                            });
+                                                            generateShipTask(this.form).then(res => {
+                                                                this.$message.success("生成出库任务成功");
+                                                                // 将按钮文本更改为"撤销任务"
+                                                                this.buttonText = '撤销任务';
+                                                                // 将按钮颜色更改为对应的颜色
+                                                                this.buttonColor = 'warning'; // 比如改为warning
+                                                                this.refresh(res.data.data.id)
+                                                                this.refreshs(res.data.data.id, true)
+                                                                this.isContacts = true
+                                                                this.isApplySettlement = false
+                                                                this.isAdd = true
+                                                                this.isDisabled = true
+                                                                this.isAddBtn = true
+                                                                this.isDisabledTask = true
+                                                                this.editButton = true // 把编辑按钮显示出来
+                                                            }).finally(() => {
+                                                                loading.close();
+                                                            })
+                                                        }).catch(() => {
                                                             loading.close();
                                                         })
-                                                    })
+                                                    } else {
+                                                        this.$confirm(res.data.data, '提示', {
+                                                            confirmButtonText: '确定',
+                                                            cancelButtonText: '取消',
+                                                            type: 'warning'
+                                                        }).then(() => {
+                                                            checkOrderRW({
+                                                                bsType: "XS",
+                                                                ...this.form
+                                                            }).then(res => {
+                                                                this.$message.success("提交成功");
+                                                                // 将按钮文本更改为"撤销任务"
+                                                                this.buttonText = '撤销任务';
+                                                                // 将按钮颜色更改为对应的颜色
+                                                                this.buttonColor = 'warning'; // 比如改为warning
+                                                                this.refresh(res.data.data.id)
+                                                                this.refreshs(res.data.data.id, true)
+                                                                this.isContacts = true
+                                                                this.isApplySettlement = false
+                                                                this.isAdd = true
+                                                                this.isDisabled = true
+                                                                this.isAddBtn = true
+                                                                this.isDisabledTask = true
+                                                                this.editButton = true
+                                                            }).finally(() => {
+                                                                loading.close();
+                                                            })
+                                                        }).catch(() => {
+                                                            loading.close();
+                                                        })
+                                                    }
+
                                                 }).catch(() => {
                                                     loading.close();
                                                 })
@@ -2051,7 +2090,7 @@ export default {
                                                 this.isDisabled = true
                                                 this.isAddBtn = true
                                                 this.isDisabledTask = true
-                                                // this.editButton = true // 把编辑按钮显示出来
+                                                this.editButton = true // 把编辑按钮显示出来
                                             }).finally(() => {
                                                 loading.close();
                                             })

+ 2 - 0
src/views/tirePartsMall/salesManagement/saleOrder/index.vue

@@ -394,6 +394,7 @@ export default {
           overHidden: true,
           search: true,
           width: 100,
+          unlinkPanels: true,
           searchRange: true,
           searchDefaultTime: ["00:00:00", "23:59:59"],
           format: "yyyy-MM-dd",
@@ -406,6 +407,7 @@ export default {
           overHidden: true,
           search: true,
           width: 100,
+          unlinkPanels: true,
           searchRange: true,
           searchDefaultTime: ["00:00:00", "23:59:59"],
           format: "yyyy-MM-dd",

+ 1 - 0
src/views/tirePartsMall/salesService/Task/index.vue

@@ -239,6 +239,7 @@ export default {
           overHidden: true,
           search: true,
           width: 100,
+          unlinkPanels: true,
           searchRange: true,
           searchDefaultTime: ["00:00:00", "23:59:59"],
           format: "yyyy-MM-dd",

+ 1 - 0
src/views/tirePartsMall/salesService/inStorage/index.vue

@@ -277,6 +277,7 @@ export default {
           overHidden: true,
           search: true,
           width: 100,
+          unlinkPanels: true,
           searchRange: true,
           searchDefaultTime: ["00:00:00", "23:59:59"],
           format: "yyyy-MM-dd",

+ 1 - 0
src/views/tirePartsMall/salesService/returns/index.vue

@@ -214,6 +214,7 @@ export default {
             overHidden: true,
             search: true,
             width: 100,
+            unlinkPanels: true,
             searchRange: true,
             searchDefaultTime: ["00:00:00", "23:59:59"],
             format: "yyyy-MM-dd",

+ 1 - 0
src/views/tirePartsMall/statisticAnalysis/salesReconciliation/index.vue

@@ -108,6 +108,7 @@ export default {
             search: true,
             width: 100,
             searchRange: true,
+            unlinkPanels: true,
             searchDefaultTime: ["00:00:00", "23:59:59"],
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss"