浏览代码

修改bug

web100 2 年之前
父节点
当前提交
b9661e7163

+ 20 - 15
src/views/basicData/customerInformation/index.vue

@@ -372,37 +372,42 @@ export default {
     searchChange(params, done) {
       console.log(params);
       this.page.currentPage = 1;
-      this.onLoad(this.page, params);
+      this.search = params; // 更新搜索条件
+      this.onLoad(this.page, this.search);
+      console.log("1133311");
+
       done();
     },
     //搜索重置按钮触发
     searchReset() {
       this.treeDeptId = "";
       this.onLoad(this.page);
+      console.log("2222");
     },
     selectionChange() {
-      console.log("1");
+      console.log("1111");
     },
-    currentChange() {
-      console.log("1");
+    currentChange(val) {
+      this.page.currentPage = val;
+      console.log(this.search);
+      this.onLoad(this.page,this.search);
+
     },
     sizeChange() {
-      console.log("1");
+      console.log("3");
     },
     refreshChange() {
       this.onLoad(this.page);
     },
-    onLoad(page, params = {}) {
-        // 将搜索条件与现有参数合并
-  const queryParams = {
-    ...params,
-    parentId: this.treeDeptId,
-    size: page.pageSize,
-    current: page.currentPage,
-    corpsTypeId: this.treeDeptId,
-    corpType: customerParameter.code
-  };
+    onLoad(page, params = { parentId: 0 }) {
+      let queryParams = Object.assign({}, this.search, {
+        size: page.pageSize,
+        current: page.currentPage,
+        corpsTypeId: this.treeDeptId,
+        corpType: customerParameter.code
+      });
       customerList(queryParams).then(res => {
+        
         this.dataList = res.data.data.records;
         this.page.total = res.data.data.total;
         if (this.page.total || this.page.total === 0) {

+ 9 - 13
src/views/bidingDocument/issueTender/detailsPageEdit.vue

@@ -1711,37 +1711,33 @@ export default {
           prop: 'harborInterceptionTime',
           index: 7,
         }, {
-          label: '船期',
-          prop: 'shippingDate',
-          index: 8,
-        }, {
           label: '起运港箱使天数',
           prop: 'departureHarborFee',
-          index: 9,
+          index: 8,
         }, {
           label: '目的港箱使天数',
           prop: 'objectiveHarborFee',
-          index: 10,
+          index: 9,
         }, 
         {
           label: '亏舱费',
           prop: 'brokenStowageAmount',
-          index: 11,
+          index: 10,
         }, 
         {
           label: '航程',
           prop: 'voyage',
-          index: 12,
+          index: 11,
         }, 
         {
           label: '主单/分单',
           prop: 'documentType',
-          index: 13,
+          index: 12,
         }, 
         {
           label: '船期',
           prop: 'shippingDate',
-          index: 14,
+          index: 13,
         }, 
        {
           label: '状态',
@@ -1753,16 +1749,16 @@ export default {
             label: "dictValue",
             value: "dictKey"
           },
-          index: 15,
+          index: 14,
         }, {
           label: '竞价排名',
           prop: 'ranking',
-          index: 16,
+          index: 15,
         }, {
           label: '备注',
           prop: 'remark',
           cell: true,
-          index: 17,
+          index: 16,
         }]
       },
       form: {},

+ 2 - 1
src/views/tirePartsMall/basicData/accountManagement/detailsPage.vue

@@ -88,7 +88,8 @@ export default {
           ],
         }, {
           label: '账户余额',
-          prop: "accountBalance"
+          prop: "accountBalance",
+          disabled:true
         }, {
           label: '备注',
           prop: "remarks",

+ 1 - 0
src/views/tirePartsMall/basicData/customerInformation/detailsPage.vue

@@ -456,6 +456,7 @@ export default {
             label: "使用信用额度",
             prop: "useCreditLimit", span: 8,
             type: "number",
+            disabled:true,
             controls: false,
             precision: 2
           }, {

+ 5 - 0
src/views/tirePartsMall/basicData/customerInformation/index.vue

@@ -261,6 +261,10 @@ export default {
     detailsPage,
     corpType
   },
+  activated(){
+    console.log(1);
+    this.$refs.crud.refreshTable()
+  },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(207), option);
     this.getAllWorkDicts()
@@ -352,6 +356,7 @@ export default {
       this.show = false;
     },
     onLoad(page, params = {}) {
+      this.$refs.crud.refreshTable()
       let data = this.deepClone(Object.assign(params, this.search));
       if (data.date && data.date.length > 0) {
         data.startTime = data.date[0]

+ 3 - 0
src/views/tirePartsMall/basicData/customerInformation/js/optionList.js

@@ -9,6 +9,9 @@ export const option = {
   tip: false,
   border: true,
   index: true,
+  indexFixed:false,
+  selectionFixed:false,
+  expandFixed:false,
   addBtn: false,
   viewBtn: false,
   editBtn: false,

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

@@ -336,14 +336,19 @@ export default {
       })
     },
     addressUnique(row, index) {
+      console.log(row.defaultAddres);
       for (let item in this.form.addressList) {
-        if (index != item) {
-          if (this.form.addressList[item].defaultAddres == 1) {
-            row.defaultAddres = 0
-            return this.$message.error("已有默认地址请关闭后再选择")
-          }
-        }
-      }
+        console.log(this.form.addaddressList[item].defaultAddres);
+    }
+      // for (let item in this.form.addressList) {
+      //   if (index != item) {
+      //     if (this.form.addressList[item].defaultAddres == 1) {
+      //       console.log(1);
+      //       row.defaultAddres = 0
+      //       return this.$message.error("已有默认地址请关闭后再选择")
+      //     }
+      //   }
+      // }
     },
     rowDelBox(row, index, isButton) {
       this.$confirm("确定将选择数据删除?", {

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

@@ -121,9 +121,9 @@ export default {
             span: 24,
             propsHttp: {
               res: "data"
-            },
+            },  
             tip: "请上传 .xls,.xlsx 标准格式文件",
-            action: "/api/blade-client/corpsdesc/import-desc?corpType=KH"
+            action: "/api/blade-sales-part/corpsDesc/supplierImport?corpType=GYS"
           }
         ]
       },
@@ -261,7 +261,7 @@ export default {
     },
     derivation() {
       window.open(
-        `/api/blade-client/corpsdesc/export-template?${this.website.tokenHeader
+        `/api/blade-sales-part/corpsDesc/supplierExport?${this.website.tokenHeader
         }=${getToken()}`
       );
     },