Browse Source

修改检索字段
修改客户管理

Qukatie 1 week ago
parent
commit
f0bdf454af

+ 48 - 21
src/views/tirePartsMall/basicData/customerInformation/detailsPage.vue

@@ -16,7 +16,11 @@
           </el-button>
         </div>
       </div>
-      <trade-card title="基础资料" style="margin-top: 60px" v-loading="loadingBtn">
+
+      <div style="color:#F56C6C;position: relative;top: 12px;z-index: 1000;left: 50%;right: -80px;width: 160px;">
+        请先禁用再进行编辑!!!
+      </div>
+      <trade-card title="基础资料" style="margin-top: 30px" v-loading="loadingBtn">
         <avue-form ref="form" class="trading-form" v-model="form" :option="option">
           <template slot="corpsTypeId">
             <div style="display:flex;">
@@ -33,7 +37,7 @@
           <!--</template>-->
           <template slot="deliveryWarehouseId">
             <div style="display:flex;">
-              <avue-input-tree
+              <!-- <avue-input-tree
                 v-model="form.deliveryWarehouseId"
                 :disabled="option.disabled"
                 placeholder="请选择发货仓库"
@@ -41,7 +45,18 @@
                 :dic="corpTypeListCk"
                 :props="propsCk"
               >
-              </avue-input-tree>
+              </avue-input-tree> -->
+              <dic-select
+                v-model="form.deliveryWarehouseName"
+                placeholder="业务员"
+                key="id"
+                label="cname"
+                url="/blade-sales-part/storageDesc/listAll"
+                :filterable="true"
+                @selectChange="dicChange('deliveryWarehouseName', $event)"
+                :disabled="option.disabled"
+              >
+              </dic-select>
               <i class="el-icon-circle-plus-outline" style="font-size:18px;line-height: 32px;margin-left:4px" @click="dialogVisibleCK = true"></i>
             </div>
           </template>
@@ -219,13 +234,13 @@ import { typeSave, customerListAll } from "@/api/tirePartsMall/basicData/warehou
 import limitrecord from "@/views/tirePartsMall/basicData/customerInformation/components/limitrecord.vue";
 import { limitrecordSubmit } from "@/api/tirePartsMall/basicData/customerInformation/limitrecord";
 import check_green_recycling_record from "@/views/tirePartsMall/basicData/customerInformation/check_green_recycling_record.vue";
-
+import dicSelect from "@/components/dicSelect/main";
 export default {
   name: "index",
   data() {
     return {
       propsCk: {
-        label: "cname",
+        label: "c",
         value: "id"
       },
       props: {
@@ -533,12 +548,12 @@ export default {
             label: "发货仓库",
             prop: "deliveryWarehouseId",
             span: 12,
-            type: "select",
-            props: {
-              label: "cname",
-              value: "id"
-            },
-            dicUrl: "/api/blade-sales-part/storageDesc/listAll",
+            // type: "select",
+            // props: {
+            //   label: "cname",
+            //   value: "id"
+            // },
+            // dicUrl: "/api/blade-sales-part/storageDesc/listAll",
             rules: [
               {
                 required: true,
@@ -735,7 +750,7 @@ export default {
           {
             label: "登录用户id",
             prop: "userId",
-            cell: true
+            display:false
           },
           {
             label: "备注",
@@ -751,7 +766,8 @@ export default {
   components: {
     corpType,
     limitrecord,
-    check_green_recycling_record
+    check_green_recycling_record,
+    dicSelect
   },
   props: {
     detailData: {
@@ -787,6 +803,16 @@ export default {
     }, 100);
   },
   methods: {
+    dicChange(name, row) {
+      if (name == "deliveryWarehouseName") {
+        if (row) {
+          this.form.deliveryWarehouseId = row.id;
+        } else {
+          this.form.deliveryWarehouseId = null;
+          this.form.deliveryWarehouseName = null;
+        }
+      }
+    },
     warehouseChange(val) {
       this.form.resourceWarehouseList = [];
       console.info("vall----", val);
@@ -892,7 +918,8 @@ export default {
           creatingUsersTwo({
             ...data,
             id: this.formRow.id,
-            deliveryWarehouseId:this.form.deliveryWarehouseId,
+            deliveryWarehouseId: this.form.deliveryWarehouseId,
+            deliveryWarehouseName: this.form.deliveryWarehouseName
           }).then(res => {
             this.dialogVisibleBt = false;
             this.formDataTwo = {};
@@ -949,13 +976,13 @@ export default {
         .then(res => {
           this.form = res.data.data;
           if (this.form.enableOrNot == 1) {
-            if (type) {
-              this.$message({
-                showClose: true,
-                message: "请先禁用再进行编辑",
-                duration: 5000
-              });
-            }
+            // if (type) {
+            //   this.$message({
+            //     showClose: true,
+            //     message: "请先禁用再进行编辑",
+            //     duration: 5000
+            //   });
+            // }
 
             this.$set(this.option, "disabled", true);
           } else {

+ 1 - 1
src/views/tirePartsMall/statisticAnalysis/financingGeneral/index.vue

@@ -228,7 +228,7 @@ export default {
           },
           {
             label: "仓库",
-            prop: "storageIds",
+            prop: "storageId",
             search: true,
             hide:true,
             overHidden: true,

+ 2 - 2
src/views/tirePartsMall/statisticAnalysis/generalLedgerPayable/index.vue

@@ -161,7 +161,7 @@ export default {
           },
           {
             label: "仓库",
-            prop: "storageIds",
+            prop: "storageId",
             search: true,
             hide:true,
             overHidden: true,
@@ -433,7 +433,7 @@ export default {
           `/api/blade-sales-part/order/statistics-export?${this.website.tokenHeader
           }=${getToken()}&type=1&businesDateList[0]=${this.search.businesDateList[0] == null || this.search.businesDateList[0] === undefined ? '' : this.search.businesDateList[0]
           }&businesDateList[1]=${this.search.businesDateList[1] == null || this.search.businesDateList[1] === undefined ? '' : this.search.businesDateList[1]
-          }&customerId=${this.search.customerName == null || this.search.customerName === undefined ? '' : this.search.customerName}&storageIds=${this.search.storageIds == null || this.search.storageIds === undefined ? "" : this.search.storageIds}`
+          }&customerId=${this.search.customerName == null || this.search.customerName === undefined ? '' : this.search.customerName}&storageId=${this.search.storageId == null || this.search.storageId === undefined ? "" : this.search.storageId}`
         );
       }).catch(() => {
         this.$message({

+ 2 - 2
src/views/tirePartsMall/statisticAnalysis/generalLedgerReceivable/index.vue

@@ -203,7 +203,7 @@ export default {
           },
           {
             label: "仓库",
-            prop: "storageIds",
+            prop: "storageId",
             search: true,
             hide:true,
             overHidden: true,
@@ -449,7 +449,7 @@ export default {
               this.search.businesDateList[0] == null || this.search.businesDateList[0] === undefined ? "" : this.search.businesDateList[0]
             }&businesDateList[1]=${
               this.search.businesDateList[1] == null || this.search.businesDateList[1] === undefined ? "" : this.search.businesDateList[1]
-            }&customerId=${this.search.customerName == null || this.search.customerName === undefined ? "" : this.search.customerName}&storageIds=${this.search.storageIds == null || this.search.storageIds === undefined ? "" : this.search.storageIds}`
+            }&customerId=${this.search.customerName == null || this.search.customerName === undefined ? "" : this.search.customerName}&storageId=${this.search.storageId == null || this.search.storageId === undefined ? "" : this.search.storageId}`
           );
         })
         .catch(() => {

+ 2 - 2
src/views/tirePartsMall/statisticAnalysis/profitLedger/index.vue

@@ -191,7 +191,7 @@ export default {
           },
           {
             label: "仓库",
-            prop: "storageIds",
+            prop: "storageId",
             search: true,
             hide:true,
             overHidden: true,
@@ -469,7 +469,7 @@ export default {
           `/api/blade-sales-part/order/statistics-export?${this.website.tokenHeader
           }=${getToken()}&type=0&businesDateList[0]=${this.search.businesDateList[0] == null || this.search.businesDateList[0] === undefined ? '' : this.search.businesDateList[0]
           }&businesDateList[1]=${this.search.businesDateList[1] == null || this.search.businesDateList[1] === undefined ? '' : this.search.businesDateList[1]
-          }&customerId=${this.search.customerName == null || this.search.customerName === undefined ? '' : this.search.customerName}&storageIds=${this.search.storageIds == null || this.search.storageIds === undefined ? "" : this.search.storageIds}`
+          }&customerId=${this.search.customerName == null || this.search.customerName === undefined ? '' : this.search.customerName}&storageId=${this.search.storageId == null || this.search.storageId === undefined ? "" : this.search.storageId}`
         );
       }).catch(() => {
         this.$message({