客户管理-增加销售组织和地区分类字段的展示和填报；修复批量删除的BUG。

src/api/business/spd/cm/customers.js

@@ -36,10 +36,11 @@ export function updateCustomers(data) {
 }
 
 // 删除客户
-export function delCustomers(id) {
+export function delCustomers(ids) {
   return request({
-    url: '/cm/customers/' + id,
-    method: 'delete'
+    url: '/cm/customers/delete',
+    method: 'post',
+    data: ids
   })
 }
 

src/views/business/spd/cm/customers/index.vue

@@ -77,7 +77,7 @@
 
         <el-table v-loading="loading" :data="customersList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
-          <!-- <el-table-column label="销售组织" align="center" prop="orgName" min-width="300" /> -->
+          <el-table-column label="销售组织" align="center" prop="orgName" min-width="300" />
           <el-table-column label="客户编码" align="center" prop="code" min-width="100" />
           <el-table-column label="客户名称" align="center" prop="name" min-width="200" />
           <el-table-column label="客户分类" align="center" prop="classification" min-width="80" show-overflow-tooltip>
@@ -148,13 +148,14 @@
               <el-tab-pane label="基本信息" name="first">
                 <el-divider content-position="left">基本信息</el-divider>
                 <el-row :gutter="20">
-                  <!-- <el-col :span="6">
-                  <el-form-item label="销售组织" prop="orgName">
-                    <el-popover-select-v2 v-model="form.orgName" title="销售组织" valueKey="name" referName="ORG_PARAM"
-                      :dataMapping="{ org: 'id', orgName: 'name'}" :source.sync="form" placeholder="请输入销售组织"  :disabled="openState == 'check'">
-                    </el-popover-select-v2>
-                  </el-form-item>
-                </el-col> -->
+                  <el-col :span="6">
+                    <el-form-item label="销售组织" prop="orgName">
+                      <el-popover-select-v2 v-model="form.orgName" title="销售组织" valueKey="name" referName="ORG_PARAM"
+                        :dataMapping="{ org: 'id', orgName: 'name'}" :source.sync="form" placeholder="请输入销售组织"
+                        :disabled="openState == 'check'">
+                      </el-popover-select-v2>
+                    </el-form-item>
+                  </el-col>
                   <el-col :span="6">
                     <el-form-item label="客户编码" prop="code">
                       <el-input v-model="form.code" placeholder="编码系统自动生成" disabled />
@@ -170,6 +171,8 @@
                       <el-input v-model="form.abbreviation" placeholder="请输入客户简称" :disabled="openState == 'check'" />
                     </el-form-item>
                   </el-col>
+                </el-row>
+                <el-row :gutter="20">
                   <el-col :span="6">
                     <el-form-item label="客户分类" prop="classification">
                       <el-select clearable v-model="form.classification" :disabled="openState == 'check'">
@@ -178,8 +181,6 @@
                       </el-select>
                     </el-form-item>
                   </el-col>
-                </el-row>
-                <el-row :gutter="20">
                   <el-col :span="6">
                     <el-form-item label="客户类型" prop="type">
                       <el-select clearable v-model="form.type" :disabled="openState == 'check'">
@@ -204,6 +205,8 @@
                       </el-select>
                     </el-form-item>
                   </el-col>
+                </el-row>
+                <el-row :gutter="20">
                   <el-col :span="6">
                     <el-form-item label="销售渠道" prop="channel">
                       <el-select clearable v-model="form.channel" :disabled="openState == 'check'">
@@ -212,8 +215,6 @@
                       </el-select>
                     </el-form-item>
                   </el-col>
-                </el-row>
-                <el-row :gutter="20">
                   <el-col :span="6">
                     <el-form-item label="业务类型" prop="businessType">
                       <el-select clearable v-model="form.businessType" :disabled="openState == 'check'">
@@ -248,11 +249,12 @@
                       </el-select>
                     </el-form-item>
                   </el-col>
-                  <!-- <el-col :span="6">
-                  <el-form-item label="地区分类" prop="areaClassification">
-                    <el-input v-model="form.areaClassification" placeholder="请输入地区分类" :disabled="openState == 'check'" />
-                  </el-form-item>
-                </el-col> -->
+                  <el-col :span="6">
+                    <el-form-item label="地区分类" prop="areaClassification">
+                      <el-input v-model="form.areaClassification" placeholder="请输入地区分类"
+                        :disabled="openState == 'check'" />
+                    </el-form-item>
+                  </el-col>
                   <el-col :span="6">
                     <el-form-item label="证照号码" prop="licenseNumber">
                       <el-input v-model="form.licenseNumber" placeholder="请输入证照号码" :disabled="openState == 'check'" />
@@ -783,26 +785,29 @@
               updateCustomers(this.form).then(response => {
                 this.$modal.msgSuccess("修改成功");
               });
+              this.reset();
+              this.getList();
+              this.isList = true;
             } else {
               addCustomers(this.form).then(response => {
                 this.$modal.msgSuccess("新增成功");
               });
+              this.reset();
+              this.getList();
+              this.isList = true;
             }
-            this.reset();
-            this.getList();
-            this.isList = true;
           }
         });
       },
       /** 删除按钮操作 */
       handleDelete(row) {
-        let ids = row.id || this.ids;
-        // for (let i = 0; i < ids.length; i++) {
-        //   ids[i] = parseInt(ids[i]);
-        // }
-        // ids = ids.join();
-        console.log(ids, 'ids')
         const codes = row.code || this.codes;
+        let ids = [];
+        if (row.isTrusted != null && row.isTrusted != '' && row.isTrusted != undefined) {
+          ids = this.ids;
+        } else {
+          ids[0] = row.id;
+        }
         this.$modal.confirm('是否确认删除客户编码为"' + codes + '"的数据项？').then(function () {
           return delCustomers(ids);
         }).then(() => {

src/views/business/spd/cm/customersDepartment/index.vue

@@ -165,14 +165,16 @@
             if (this.form.id != null) {
               updateCustomersDepartment(this.form).then(response => {
                 this.$modal.msgSuccess("修改成功");
+                this.cancel();
+                this.$parent.handleCheck(this.form.customersId);
               });
             } else {
               addCustomersDepartment(this.form).then(response => {
                 this.$modal.msgSuccess("新增成功");
+                this.cancel();
+                this.$parent.handleCheck(this.form.customersId);
               });
             }
-            this.cancel();
-            this.$parent.handleCheck(this.form.customersId);
           }
         });
       },

src/views/business/spd/cm/customersResponsiblePerson/index.vue

@@ -158,14 +158,16 @@
             if (this.form.id != null) {
               updateCustomersResponsiblePerson(this.form).then(response => {
                 this.$modal.msgSuccess("修改成功");
+                this.cancel();
+                this.$parent.handleCheck(this.form.customersId);
               });
             } else {
               addCustomersResponsiblePerson(this.form).then(response => {
                 this.$modal.msgSuccess("新增成功");
+                this.cancel();
+                this.$parent.handleCheck(this.form.customersId);
               });
             }
-            this.cancel();
-            this.$parent.handleCheck(this.form.customersId);
           }
         });
       },