web100 2 lat temu
rodzic
commit
603138fa47

+ 35 - 26
src/views/statisticAnalysis/customerDelivery/index.vue

@@ -13,7 +13,7 @@
           <crop-select v-model="search.corpName" corpType="KH" :zhKey="true"></crop-select>
         </template>
         <template slot="quantity" slot-scope="scope">
-          <span style="color: #409EFF;cursor: pointer" @click.stop="detOpen(scope.row)">{{ scope.row.quantity}}</span>
+          <span style="color: #409EFF;cursor: pointer" @click.stop="detOpen(scope.row)">{{ scope.row.quantity }}</span>
         </template>
         <template slot="dateSearch">
           <el-date-picker v-model="search.date" type="daterange" start-placeholder="开始日期" end-placeholder="结束日期"
@@ -22,12 +22,8 @@
         </template>
       </avue-crud>
     </basic-container>
-    <statistics-detailed
-        v-else
-        :codeValue="226.1"
-        @backToList="show = true"
-        :search="{...search,corpName:this.corpName}"
-        url="corpStatisticsItem"></statistics-detailed>
+    <statistics-detailed v-else :codeValue="226.1" @backToList="show = true"
+      :search="{ ...search, corpName: this.corpName }" url="corpStatisticsItem"></statistics-detailed>
   </div>
 </template>
 
@@ -39,11 +35,11 @@ import { defaultDate5 } from "@/util/date";
 import statisticsDetailed from "@/components/statisticsDetailed/index.vue";
 export default {
   name: "index",
-  components:{statisticsDetailed},
+  components: { statisticsDetailed },
   data() {
     return {
-      corpName:'',
-      show:true,
+      corpName: '',
+      show: true,
       UConfiguration: {
         multipleChoices: false,
         multiple: false,
@@ -55,7 +51,7 @@ export default {
       },
       form: {},
       search: {
-        date:defaultDate5()
+        date: defaultDate5()
       },
       dataList: [],
       loading: false,
@@ -87,12 +83,12 @@ export default {
           {
             name: "quantity",
             type: "sum",
-            decimals:0
+            decimals: 0
           },
           {
             name: "amount",
             type: "sum",
-            decimals:2
+            decimals: 2
           }
         ],
         column: [
@@ -102,7 +98,7 @@ export default {
             type: "date",
             format: 'yyyy-MM-dd',
             valueFormat: 'yyyy-MM-dd',
-            searchValue:defaultDate5(),
+            searchValue: defaultDate5(),
             searchRange: true,
             overHidden: true,
             hide: true,
@@ -149,7 +145,7 @@ export default {
               label: "name",
               value: "name"
             },
-            dicData:[],
+            dicData: [],
             dataType: "string",
             overHidden: true,
             search: true
@@ -173,7 +169,7 @@ export default {
     this.getAllWorkDicts()
   },
   activated() {
-   this.$nextTick(() => {
+    this.$nextTick(() => {
       this.$refs.crud.refreshTable();
     });
   },
@@ -257,32 +253,45 @@ export default {
     editOpen(row) {
     },
     //打开明细
-    detOpen(row){
+    detOpen(row) {
       this.corpName = row.corpName
       this.show = false
     },
     outExport() {
-      let params = { ...this.search }
+      let params = { ...this.search };
       if (params.date && params.date.length > 0) {
         params = {
           ...params,
           beginTime: params.date[0],
           endTime: params.date[1],
-        }
+        };
       } else {
         params = {
           ...params,
           beginTime: '',
           endTime: '',
-        }
+        };
+      }
+      // 添加仅导出一条记录的检查
+      if (this.dataList.length === 1) {
+        const record = this.dataList[0];
+        console.log(record.corpName);
+        // 修改导出URL以包含特定记录的ID或其他标识符
+        window.open(
+          // `/api/blade-purchase-sales/exportOrder/corpStatisticsExport?${this.website.tokenHeader}=${getToken()}&id=${record.id}`
+          `/api/blade-purchase-sales/exportOrder/corpStatisticsExport?${this.website.tokenHeader}=${getToken()}&beginTime=${params.beginTime}&endTime=${params.endTime}&chargeMember=${params.chargeMember}&brand=${params.brand ? params.brand : ''}&corpName=${params.corpName}`
+        );
+      } else {
+        // 像之前一样导出多条记录
+        // 临时更改
+        if (!params.chargeMember) params.chargeMember = null;
+        console.log(params);
+        window.open(
+          `/api/blade-purchase-sales/exportOrder/corpStatisticsExport?${this.website.tokenHeader}=${getToken()}&beginTime=${params.beginTime}&endTime=${params.endTime}&chargeMember=${params.chargeMember}&brand=${params.brand ? params.brand : ''}`
+        );
       }
-      //临时更改
-      if (!params.chargeMember) params.chargeMember = null
-      window.open(
-        `/api/blade-purchase-sales/exportOrder/corpStatisticsExport?${this.website.tokenHeader
-        }=${getToken()}&beginTime=${params.beginTime}&endTime=${params.endTime}&chargeMember=${params.chargeMember}&brand=${params.brand? params.brand : ''}`
-      );
     }
+
   }
 };
 </script>

+ 1 - 2
src/views/tirePartsMall/basicData/shareListing/index.vue

@@ -238,8 +238,7 @@ export default {
           prop: "sourceCompanyId",
           hide: true,
           search: true,
-          showColumn: false,
-          display: false,
+          showColumn: true,
           overHidden: true,
           type: 'select',
           props: {

+ 42 - 7
src/views/tirePartsMall/basicData/supplier/detailsPage.vue

@@ -42,7 +42,7 @@
                 row.$cellEdit ? '确认' : '修改' }}
             </el-button>
             <el-button icon="el-icon-delete" :size="size" :disabled="disabled" :type="type"
-              @click="rowDelBox(row, index)">删除
+              @click="rowDelBox(row, index, 'rowDelBox1')">删除
             </el-button>
           </template>
         </avue-crud>
@@ -58,7 +58,7 @@
                 row.$cellEdit ? '确认' : '修改' }}
             </el-button>
             <el-button icon="el-icon-delete" :size="size" :disabled="disabled" :type="type"
-              @click="rowDelBox(row, index)">删除
+              @click="rowDelBox(row, index, 'rowDelBox2')">删除
             </el-button>
           </template>
           <template slot="defaultAddres" slot-scope="{row,index,disabled}">
@@ -91,7 +91,7 @@
 <script>
 
 // import {detail, submit} from "@/api/basicData/shipManagement";
-import { getDetails, submit, editenable } from "@/api/tirePartsMall/basicData/customerInformation";
+import { getDetails, submit, editenable, corpsattn, itemDel } from "@/api/tirePartsMall/basicData/customerInformation";
 import { getCorpType } from "@/api/tirePartsMall/basicData/customerInformation"
 import corpType from '@/components/corpType/index'
 export default {
@@ -339,19 +339,54 @@ export default {
         }
       }
     },
-    rowDelBox(row, index) {
+    refreshPage() {
+      this.load()
+    },
+    rowDelBox(row, index, isButton) {
       this.$confirm("确定将选择数据删除?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       }).then(() => {
         if (row.id) {
+          if (isButton === 'rowDelBox1') {
+            //有id的时候删除
+            corpsattn(row.id).then(res => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!"
+                });
+                this.refreshPage();
+              }
+            });
+          }else{
+            itemDel(row.id).then(res => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!"
+                });
+                this.refreshPage();
+
+              }
+            });
+          }
+          // this.form.corpsAttnList.splice(index, 1);
           // tradingBox(row.id).then(res => {
-          //   this.form.contactsList.splice(index, 1);
-          //   this.$message.success("操作成功!");
+          // this.form.contactsList.splice(index, 1);
+          // this.form.corpsAttnList.splice(index, 1);
+          // this.$message.success("操作成功!");
           // });
         } else {
-          this.form.contactsList.splice(index, 1);
+          if (isButton === 'rowDelBox1') {
+            this.form.corpsAttnList.splice(index, 1);
+          } else {
+
+            this.form.corpsAddrList.splice(index, 1);
+          }
+          console.log(this.form.corpsAddrList);
+          // this.form.contactsList.splice(index, 1);
           this.$message.success("操作成功!");
         }
       }

+ 3 - 3
src/views/tirePartsMall/basicData/supplier/index.vue

@@ -195,11 +195,11 @@ export default {
           label: '是否启用',
           prop: 'enableOrNot',
           dicData: [{
-            label: '否',
-            value: 0
-          }, {
             label: '是',
             value: 1
+          }, {
+            label: '否',
+            value: 0
           }]
         }]
       }