Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

liuyg

2021-05-13 acfad567090d0ab3c38797203bb443a14a135f0f

Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

 src/views/clientManagement/clientManagement.vue

@@ -85,6 +85,17 @@
            <i class="el-icon-close client-qf" v-else-if="row.type == '1' "></i>
          </template>

          <template slot-scope="{ type, size, row }" slot="menu">
            <el-button
              v-if="row.dtype == 2"
              icon="el-icon-s-order"
              :size="size"
              :type="type"
              @click.stop="updateDtype(row)"
            >办结
            </el-button>
          </template>

        </avue-crud>

        <div v-show="menuVisible">
@@ -93,6 +104,7 @@
            <li class="menu_item" @click.stop="handleMap">定位</li>
          </ul>
        </div>


        <el-drawer
          title="电子地图"
@@ -290,7 +302,7 @@
          calcHeight: 54,
          labelWidth: '125',
          dialogWidth: 1150,
          menuWidth: 150,
          menuWidth: 200,
          align:"center",
          size: "mini",
          tip: false,
@@ -894,6 +906,20 @@
          loading();
        });
      },
      updateDtype(row){
        row.dtype = "0";
        update(row).then(() => {
          // this.initFlag = false;
          this.onLoad(this.page);
          this.$message({
            type: "success",
            message: "操作成功!"
          });
          this.onLoad(this.page);
        }, error => {
          window.console.log(error);
        });
      },
      rowDel(row) {
        this.$confirm("确定将选择数据删除?", {
          confirmButtonText: "确定",

 src/views/system/user.vue

@@ -541,11 +541,7 @@
                    label: "postName",
                    value: "id"
                  },
                  rules: [{
                    required: true,
                    message: "请选择所属岗位",
                    trigger: "click"
                  }],

                },
              ]
            },