Merge remote-tracking branch 'origin/ecp' into ecp

src/api/store/customerInformation.js

@@ -11,11 +11,11 @@ export function areaTypeTree() {
 
 
 // 创建用户2
-export function creatingUsersTwo(data) {
+export function creatingUsersTwo(params) {
     return request({
         url: '/api/gubersail-admin/corpsAttn/user',
-        method: 'post',
-        data: data
+        method: 'get',
+        params: params
     })
 }
 

src/api/store/label.js

@@ -0,0 +1,36 @@
+import request from '@/router/axios';
+
+//客户类别列表查询
+export function customerList(data) {
+    return request({
+        url: '/api/gubersail-admin/corpslabel/list',
+        method: 'get',
+        params: data
+    })
+}
+
+//客户类别列表修改和新增
+export function typeSave(data) {
+    return request({
+        url: '/api/gubersail-admin/corpslabel/submit',
+        method: 'post',
+        data: data
+    })
+}
+//客户类别列表查看明细
+export function detail(data) {
+    return request({
+        url: '/api/gubersail-admin/corpslabel/detail?id='+data,
+        method: 'get'
+    })
+}
+//客户类别列表修改和新增
+export function remove(data) {
+    return request({
+        url: '/api/gubersail-admin/corpslabel/remove',
+        method: 'post',
+        params: {
+            ids:data
+        }
+    })
+}

src/views/claimSettlement/detailsPage.vue

@@ -245,7 +245,18 @@ export default {
           {
             label: "审核结论",
             prop: "auditResult",
-            overHidden: true
+            overHidden: true,
+            type: "select",
+            dicData: [
+              {
+                label: "通过",
+                value: 1
+              },
+              {
+                label: "拒绝",
+                value: 2
+              }
+            ],
           },
           {
             label: "核定赔付金额",

src/views/complain/detailsPage.vue

@@ -299,7 +299,22 @@ export default {
           {
             label: "回复类型",
             prop: "replyType",
-            overHidden: true
+            overHidden: true,
+            type: "select",
+            dicData: [
+              {
+                label: "系统回复",
+                value: 1
+              },
+              {
+                label: "客户反馈",
+                value: 2
+              },
+              {
+                label: "申诉",
+                value: 3
+              }
+            ],
           },
           {
             label: "回复内容",

src/views/store/components/index.vue

@@ -1,49 +1,37 @@
 <template>
   <avue-crud
-      :option="option"
-      :data="dataList"
-      ref="crud"
-      v-model="form"
-      :page.sync="page"
-      @row-del="rowDel"
-      @row-update="rowUpdate"
-      :before-open="beforeOpen"
-      :before-close="beforeClose"
-      :table-loading="loading"
-      @row-save="rowSave"
-      :search.sync="search"
-      @search-change="searchChange"
-      @search-reset="searchReset"
-      @selection-change="selectionChange"
-      @current-change="currentChange"
-      @size-change="sizeChange"
-      @refresh-change="refreshChange"
-      @saveColumn="saveColumn"
-      @resetColumn="resetColumn"
-      @on-load="onLoad"
-      @tree-load="treeLoad"
+    :option="option"
+    :data="dataList"
+    ref="crud"
+    v-model="form"
+    :page.sync="page"
+    @row-del="rowDel"
+    @row-update="rowUpdate"
+    :before-open="beforeOpen"
+    :before-close="beforeClose"
+    :table-loading="loading"
+    @row-save="rowSave"
+    :search.sync="search"
+    @search-change="searchChange"
+    @search-reset="searchReset"
+    @selection-change="selectionChange"
+    @current-change="currentChange"
+    @size-change="sizeChange"
+    @refresh-change="refreshChange"
+    @saveColumn="saveColumn"
+    @resetColumn="resetColumn"
+    @on-load="onLoad"
+    @tree-load="treeLoad"
   >
     <template slot-scope="scope" slot="menu">
-     <el-button
-       type="text"
-       icon="el-icon-circle-plus-outline"
-       size="small"
-       @click.stop="handleAdd(scope.row, scope.index)"
-       >新增子项
-     </el-button>
+      <el-button type="text" icon="el-icon-circle-plus-outline" size="small" @click.stop="handleAdd(scope.row, scope.index)">新增子项 </el-button>
     </template>
   </avue-crud>
 </template>
 
 <script>
-import option from "../configuration/mainList.json";
-import {
-  customerList,
-  typeSave,
-  detail,
-  deleteDetails
-} from "@/api/store/customerCategory";
-import {customerParameter} from "@/api/store/management-type";
+import { customerList, typeSave, detail, deleteDetails } from "@/api/store/customerCategory";
+import { customerParameter } from "@/api/store/management-type";
 
 export default {
   name: "customerInformation",
@@ -51,7 +39,118 @@ export default {
     return {
       form: {},
       search: {},
-      option: option,
+      option: {
+        headerAlign: "center",
+        align: "center",
+        border: true,
+        stripe: true,
+        index: true,
+        lazy: true,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        tree: true,
+        selection: true,
+        viewBtn: true,
+        menuWidth: 300,
+        column: [
+          {
+            label: "类型",
+            prop: "cname",
+            search: true,
+            index: 1,
+            rules: [
+              {
+                required: true,
+                message: "请输入客户类型",
+                trigger: "blur"
+              }
+            ]
+          },
+          {
+            label: "创建时间",
+            prop: "createTimeA",
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd",
+            searchRange: true,
+            hide: true,
+            addDisplay: false,
+            viewDisplay: false,
+            search: true,
+            editDisplay: false,
+            index: 2,
+            width: 100,
+            rules: [
+              {
+                required: true,
+                message: "请输入创建时间",
+                trigger: "blur"
+              }
+            ]
+          },
+          {
+            label: "上级类型",
+            prop: "parentId",
+            dicData: [],
+            type: "tree",
+            hide: true,
+            showColumn: false,
+            addDisabled: false,
+            props: {
+              label: "cname",
+              value: "id"
+            },
+            rules: [
+              {
+                required: false,
+                message: "请选择上级机构",
+                trigger: "click"
+              }
+            ]
+          },
+          {
+            label: "排序",
+            prop: "sort",
+            type: "number",
+            index: 5,
+            width: 60,
+            rules: [
+              {
+                required: true,
+                message: "请输入排序",
+                trigger: "blur"
+              }
+            ]
+          },
+          {
+            label: "状态",
+            type: "select",
+            prop: "status",
+            search: true,
+            index: 4,
+            width: 100,
+            value: 0,
+            dicData: [
+              {
+                label: "正常",
+                value: 0
+              },
+              {
+                label: "关闭",
+                value: 1
+              }
+            ],
+            rules: [
+              {
+                required: true,
+                message: "请输入状态",
+                trigger: "blur"
+              }
+            ]
+          }
+        ]
+      },
       loading: false,
       parentId: 0,
       dataList: [],
@@ -64,26 +163,27 @@ export default {
       query: {}
     };
   },
-  async created() {
-  },
+  async created() {},
   methods: {
     //删除列表后面的删除按钮触发触发(row, index, done)
     rowDel(row, index, done) {
-      console.log('5555555555555555555555555555555555');
+      console.log("5555555555555555555555555555555555");
       this.$confirm("确定将选择数据删除?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      }).then(() => {
-        return deleteDetails(row.id);
-      }).then(() => {
-        this.$message({
-          type: "success",
-          message: "操作成功!"
+      })
+        .then(() => {
+          return deleteDetails(row.id);
+        })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          // 数据回调进行刷新
+          done(row);
         });
-        // 数据回调进行刷新
-        done(row);
-      });
     },
     //修改时的修改按钮点击触发
     rowUpdate(row, index, done, loading) {
@@ -106,7 +206,7 @@ export default {
     },
     //新增修改时保存触发
     rowSave(row, done, loading) {
-      console.log('33333333333333');
+      console.log("33333333333333");
       row.corpType = customerParameter.code;
       typeSave(row).then(
         res => {
@@ -125,7 +225,7 @@ export default {
     },
     //查询全部
     initData() {
-      customerList({corpType: customerParameter.code}).then(res => {
+      customerList({ corpType: customerParameter.code }).then(res => {
         const column = this.findObject(this.option.column, "parentId");
         column.dicData = res.data.data.records;
       });
@@ -184,7 +284,7 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
-      const {createTimeA} = this.query;
+      const { createTimeA } = this.query;
       let values = {
         ...params,
         corpType: customerParameter.code,
@@ -205,7 +305,7 @@ export default {
       values.parentId = 0;
       customerList(values)
         .then(res => {
-          console.log('24324');
+          console.log("24324");
           this.dataList = res.data.data.records;
           this.page.total = res.data.data.total;
         })
@@ -219,10 +319,7 @@ export default {
        * 已定义全局方法，直接使用，getColumnName方法用来获取枚举值，参数根据自己定义的code值获取中文名
        * 一定要执行异步操作，要等接口成功返回，才能执行下一行代码
        */
-      const inSave = await this.saveColumnData(
-        this.getColumnName(141.2),
-        this.option
-      );
+      const inSave = await this.saveColumnData(this.getColumnName(141.2), this.option);
       if (inSave) {
         this.$nextTick(() => {
           this.$refs.crud.doLayout();
@@ -246,7 +343,7 @@ export default {
     //树桩列点击展开触发
     treeLoad(tree, treeNode, resolve) {
       const parentId = tree.id;
-      customerList({parentId: parentId}).then(res => {
+      customerList({ parentId: parentId }).then(res => {
         resolve(res.data.data.records);
       });
     }
@@ -256,6 +353,6 @@ export default {
 
 <style scoped>
 .page-crad ::v-deep .basic-container__card {
-    height: 94.8vh;
+  height: 94.8vh;
 }
 </style>

src/views/store/components/label.vue

@@ -0,0 +1,266 @@
+<template>
+  <avue-crud
+    :option="option"
+    :data="dataList"
+    ref="crud"
+    v-model="form"
+    :page.sync="page"
+    @row-del="rowDel"
+    @row-update="rowUpdate"
+    :before-open="beforeOpen"
+    :before-close="beforeClose"
+    :table-loading="loading"
+    @row-save="rowSave"
+    :search.sync="search"
+    @search-change="searchChange"
+    @search-reset="searchReset"
+    @selection-change="selectionChange"
+    @current-change="currentChange"
+    @size-change="sizeChange"
+    @refresh-change="refreshChange"
+    @saveColumn="saveColumn"
+    @resetColumn="resetColumn"
+    @on-load="onLoad"
+    @tree-load="treeLoad"
+  >
+    <template slot-scope="scope" slot="menu">
+      <el-button type="text" icon="el-icon-circle-plus-outline" size="small" @click.stop="handleAdd(scope.row, scope.index)">新增子项 </el-button>
+    </template>
+  </avue-crud>
+</template>
+
+<script>
+import { customerList, typeSave, detail, remove } from "@/api/store/label.js";
+import { customerParameter } from "@/api/store/management-type";
+
+export default {
+  name: "customerInformation",
+  data() {
+    return {
+      form: {},
+      search: {},
+      option: {
+        headerAlign: "center",
+        align: "center",
+        border: true,
+        stripe: true,
+        index: true,
+        lazy: true,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        tree: true,
+        selection: true,
+        viewBtn: true,
+        menuWidth: 300,
+        column: [
+          {
+            label: "门店标签",
+            prop: "label",
+            search: true,
+            index: 1,
+            rules: [
+              {
+                required: true,
+                message: "请输入门店标签",
+                trigger: "blur"
+              }
+            ]
+          },
+          {
+            label: "状态",
+            type: "select",
+            prop: "status",
+            search: true,
+            index: 4,
+            width: 100,
+            value: '0',
+            dicData: [
+              {
+                label: "正常",
+                value: '0'
+              },
+              {
+                label: "关闭",
+                value: '1'
+              }
+            ],
+            rules: [
+              {
+                required: true,
+                message: "请输入状态",
+                trigger: "blur"
+              }
+            ]
+          },
+          
+          {
+            label: "备注",
+            prop: "remarks",
+          },
+        ]
+      },
+      loading: false,
+      parentId: 0,
+      dataList: [],
+      page: {
+        pageSize: 20,
+        currentPage: 1,
+        total: 0,
+        pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
+      },
+      query: {}
+    };
+  },
+created() {},
+  methods: {
+    //删除列表后面的删除按钮触发触发(row, index, done)
+    rowDel(row, index, done) {
+      console.log("5555555555555555555555555555555555");
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          // 数据回调进行刷新
+          done(row);
+        });
+    },
+    //修改时的修改按钮点击触发
+    rowUpdate(row, index, done, loading) {
+    //   row.corpType = customerParameter.code;
+      typeSave(row).then(
+        () => {
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          // 数据回调进行刷新
+          done(row);
+          this.onLoad(this.page);
+        },
+        error => {
+          window.console.log(error);
+          loading();
+        }
+      );
+    },
+    //新增修改时保存触发
+    rowSave(row, done, loading) {
+      console.log("33333333333333");
+    //   row.corpType = customerParameter.code;
+      typeSave(row).then(
+        res => {
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          this.onLoad(this.page);
+          done(row);
+        },
+        error => {
+          window.console.log(error);
+          loading();
+        }
+      );
+    },
+    //查询全部
+    initData() {
+      customerList({ corpType: customerParameter.code }).then(res => {
+        // const column = this.findObject(this.option.column, "parentId");
+        // column.dicData = res.data.data.records;
+      });
+    },
+    //新增子项触发
+    handleAdd(row) {
+    //   this.parentId = row.id;
+    //   const column = this.findObject(this.option.column, "parentId");
+    //   column.value = row.id;
+    //   column.addDisabled = true;
+      this.$refs.crud.rowAdd();
+    },
+    //新增子项和新增触发查询所有
+    beforeOpen(done, type) {
+      if (["add", "edit"].includes(type)) {
+        this.initData();
+      }
+      if (["edit", "view"].includes(type)) {
+        detail(this.form.id).then(res => {
+          this.form = res.data.data;
+        });
+      }
+      done();
+    },
+    //点击新增时触发
+    beforeClose(done) {
+    //   console.log(1);
+    //   this.parentId = "";
+    //   const column = this.findObject(this.option.column, "parentId");
+    //   column.value = "";
+    //   column.addDisabled = false;
+      done();
+    },
+    //点击搜索按钮触发
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      params.parentId = 0;
+      this.onLoad(this.page, params);
+      done();
+    },
+    searchReset() {
+      console.log("1");
+    },
+    selectionChange() {
+      console.log("1");
+    },
+    currentChange() {
+      console.log("1");
+    },
+    sizeChange() {
+      console.log("1");
+    },
+    refreshChange() {
+      console.log("1");
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      let values = {
+        ...params,
+        size: this.page.pageSize,
+        current: this.page.currentPage
+      };
+      customerList(values)
+        .then(res => {
+          console.log("24324");
+          this.dataList = res.data.data.records;
+          this.page.total = res.data.data.total;
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    //树桩列点击展开触发
+    treeLoad(tree, treeNode, resolve) {
+      const parentId = tree.id;
+      customerList({ parentId: parentId }).then(res => {
+        resolve(res.data.data.records);
+      });
+    }
+  }
+};
+</script>
+
+<style scoped>
+.page-crad ::v-deep .basic-container__card {
+  height: 94.8vh;
+}
+</style>

src/views/store/configuration/mainList.json

@@ -1,105 +0,0 @@
-{
-  "headerAlign": "center",
-  "align": "center",
-  "border": true,
-  "stripe": true,
-  "index": true,
-  "lazy": true,
-  "tip": false,
-  "searchShow": true,
-  "searchMenuSpan": 6,
-  "tree": true,
-  "selection": true,
-  "viewBtn": true,
-  "menuWidth": 300,
-  "column": [
-    {
-      "label": "类型",
-      "prop": "cname",
-      "search": true,
-      "index": 1,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入客户类型",
-          "trigger": "blur"
-        }
-      ]
-    },
-    {
-      "label": "创建时间",
-      "prop": "createTimeA",
-      "type": "date",
-      "format": "yyyy-MM-dd",
-      "valueFormat": "yyyy-MM-dd",
-      "searchRange":true,
-      "hide": true,
-      "addDisplay": false,
-      "viewDisplay": false,
-      "search": true,
-      "editDisplay":false,
-      "index": 2,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入创建时间",
-          "trigger": "blur"
-        }
-      ]
-    },
-    {
-      "label": "上级类型",
-      "prop": "parentId",
-      "dicData": [],
-      "type": "tree",
-      "hide": true,
-      "showColumn":false,
-      "addDisabled": false,
-      "props": {
-        "label": "cname",
-        "value": "id"
-      },
-      "rules": [{
-        "required": false,
-        "message": "请选择上级机构",
-        "trigger": "click"
-      }]
-    },
-    {
-      "label": "排序",
-      "prop": "sort",
-      "type": "number",
-      "index": 5,
-      "width": 60,
-      "rules": [{
-        "required": true,
-        "message": "请输入排序",
-        "trigger": "blur"
-      }]
-    },
-    {
-      "label": "状态",
-      "type": "select",
-      "prop": "status",
-      "search": true,
-      "index": 4,
-      "width": 100,
-      "value":0,
-      "dicData": [{
-        "label": "正常",
-        "value": 0
-      }, {
-        "label": "关闭",
-        "value": 1
-      }],
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入状态",
-          "trigger": "blur"
-        }
-      ]
-    }
-  ]
-}

src/views/store/detailsPage.vue

@@ -18,12 +18,14 @@
       </div>
       <trade-card title="基础资料" style="margin-top: 60px" v-loading="loadingBtn">
         <avue-form ref="form" class="trading-form" v-model="form" :option="option">
+          <template slot="corpsTypeIdLabel">
+            <span style="color: #409EFF;cursor: pointer" @click="corpTypeVisible = true">
+              客户分类
+            </span>
+          </template>
           <template slot="corpsTypeId">
-            <div style="display:flex;">
-              <avue-input-tree v-model="form.corpsTypeId" :disabled="option.disabled" placeholder="请选择客户分类" :dic="corpTypeList" :props="props">
-              </avue-input-tree>
-              <i class="el-icon-circle-plus-outline" style="font-size:18px;line-height: 32px;margin-left:4px" @click="corpTypeVisible = true"></i>
-            </div>
+            <avue-input-tree v-model="form.corpsTypeId" :disabled="option.disabled" placeholder="请选择客户分类" :dic="corpTypeList" :props="props">
+            </avue-input-tree>
           </template>
           <tempalte slot="salesmanName">
             <dic-select
@@ -39,26 +41,30 @@
             </dic-select>
           </tempalte>
           <tempalte slot="deliveryWarehouseName">
-            <!-- <dic-select
+            <dic-select
               v-model="form.deliveryWarehouseName"
               placeholder="发货仓库"
               label="cname"
+              res="records"
               url="/gubersail-admin/storageDesc/list?current=1&size=5"
               :filterable="true"
+              :remote="true"
+              dataName="cname"
               @selectChange="dicChange('deliveryWarehouseName', $event)"
-              :multiple="true"
               :disabled="option.disabled"
-            ></dic-select> -->
+            ></dic-select>
+          </tempalte>
+          <tempalte slot="label">
             <dic-select
-              v-model="form.deliveryWarehouseName"
-              placeholder="港口"
-              label="cname"
+              :key="labelKey"
+              v-model="form.label"
+              placeholder="门店标签"
+              label="label"
               res="records"
-              url="/gubersail-admin/storageDesc/list?current=1&size=5"
+              url="/gubersail-admin/corpslabel/list?current=1&size=5"
               :filterable="true"
               :remote="true"
-              dataName="cname"
-              @selectChange="dicChange('deliveryWarehouseName', $event)"
+              dataName="label"
               :disabled="option.disabled"
             ></dic-select>
           </tempalte>
@@ -75,6 +81,11 @@
               dataType="string"
             ></dic-select>
           </tempalte>
+          <template slot="labelLabel">
+            <span style="color: #409EFF;cursor: pointer" @click="labelVisible = true">
+              门店标签
+            </span>
+          </template>
         </avue-form>
       </trade-card>
       <trade-card title="客户联系人" v-loading="loadingBtn">
@@ -97,7 +108,7 @@
               >{{ row.$cellEdit ? "确认" : "修改" }}
             </el-button>
             <el-button icon="el-icon-delete" :size="size" :disabled="disabled" :type="type" @click="rowDelTwo(row, index)">删除 </el-button>
-            <!-- <el-button icon="el-icon-check" :size="size" :type="type" @click="creatingUsers(row)">创建用户 </el-button> -->
+            <el-button icon="el-icon-check" :size="size" :type="type" @click="creatingUsers(row)">创建用户 </el-button>
           </template>
         </avue-crud>
       </trade-card>
@@ -146,7 +157,7 @@
         @closed="corpTypeClosed"
       >
         <span>
-          <corp-type></corp-type>
+          <corp-type v-if="corpTypeVisible"></corp-type>
         </span>
         <div class="avue-dialog__footer">
           <el-button @click="corpTypeVisible = false" size="mini">取 消</el-button>
@@ -154,7 +165,15 @@
         </div>
       </el-dialog>
     </div>
-
+    <el-dialog title="设置门店标签" v-dialogDrag :visible.sync="labelVisible" class="avue-dialog" width="80%" append-to-body @closed="labelClosed">
+      <span>
+        <corp-label v-if="labelVisible"></corp-label>
+      </span>
+      <div class="avue-dialog__footer">
+        <el-button @click="labelVisible = false" size="mini">取 消</el-button>
+        <el-button @click="addLabel" type="primary" size="mini">确 定</el-button>
+      </div>
+    </el-dialog>
     <el-dialog title="创建用户" :visible.sync="dialogVisibleBt" append-to-body width="60%">
       <avue-form v-if="dialogVisibleBt" ref="formDataTwo" v-model="formDataTwo" :option="optionData"> </avue-form>
       <span slot="footer" class="dialog-footer">
@@ -183,6 +202,7 @@ import { getRoleTree } from "@/api/system/role";
 import { getDeptTree } from "@/api/system/dept";
 import { getPostList } from "@/api/system/post";
 import corpType from "./components/index.vue";
+import corpLabel from "./components/label.vue";
 import website from "@/config/website";
 import dicSelect from "@/components/dicSelect/main.vue";
 
@@ -190,6 +210,8 @@ export default {
   name: "index",
   data() {
     return {
+      labelKey: Date.now(),
+      labelVisible: false,
       propsCk: {
         label: "cname",
         value: "id"
@@ -582,7 +604,7 @@ export default {
       userObj: {}
     };
   },
-  components: { corpType, dicSelect },
+  components: { corpType, dicSelect, corpLabel },
   props: {
     detailData: {
       type: Object
@@ -796,6 +818,10 @@ export default {
       this.getCorpType();
       this.corpTypeVisible = false;
     },
+    addLabel() {
+      this.labelKey = Date.now();
+      this.labelVisible = false;
+    },
     //修改提交触发
     editCustomer() {
       this.$refs.form.validate((valid, done) => {
@@ -841,25 +867,30 @@ export default {
     },
     creatingUsers(row) {
       console.log("row", row);
-      if (row.id) {
-        if (row.tel) {
-          if (!row.userId) {
-            this.dialogVisibleBt = true;
-            this.formDataTwo = {
-              roleId: ["1658417787548205058"],
-              postId: ["1742709504333688834"],
-              deptId: [this.userObj.dept_id]
-            };
-            this.formRow = row;
-          } else {
-            this.$message.error("已经存在用户,请勿重复创建");
-          }
-        } else {
-          this.$message.error("请输入手机号");
-        }
-      } else {
-        this.$message.error("请保存数据后再点击");
+      if (!row.id) {
+        this.$message.error("请保存数据");
+      }
+      if (!row.cname || !row.tel) {
+        this.$message.error("请完善联系人和电话");
       }
+      if (!row.id) {
+        this.$message.error("请保存数据");
+      }
+      if (row.userId) {
+        this.$message.error("已创建，请勿重复操作");
+      }
+      this.$confirm("是否创建用户?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        creatingUsersTwo({
+          id: row.id
+        }).then(res => {
+          this.$message.success("创建用户成功,默认帐号：手机号。默认密码：123456");
+          this.getDetail(this.form.id);
+        });
+      });
     },
     //新增客户联系人保存触发
     rowSave(row, done, loading) {