Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterprises

shuishen

2021-09-17 e39c78a3a9e00f94a37e71e0bd92f8c3c93693a0

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterprises

 src/views/dispatch/dispatchChildoperable.vue

@@ -513,7 +513,7 @@
            this.option1.column,
            "dispatcherUnitId"
          );
          console.log(res.data.data, 111);
          // console.log(res.data.data, 111);
          dispatcherUnitIdColumn.dicData = res.data.data;
        });
      }
@@ -525,7 +525,7 @@
          );
          dispatcherUnitIdColumn.dicData = res.data.data;
        });
        getListByDeptId(that.userInfo.dept_id,1).then((res) => {
        getListByDeptId(that.userInfo.dept_id, 1).then((res) => {
          const userIdsColumn = that.findObject(this.option1.column, "userIds");
          userIdsColumn.dicData = res.data.data;
        });

 src/views/dispatch/dispatchChildoperableSee.vue

@@ -513,7 +513,7 @@
            this.option1.column,
            "dispatcherUnitId"
          );
          console.log(res.data.data, 111);
          // console.log(res.data.data, 111);
          dispatcherUnitIdColumn.dicData = res.data.data;
        });
      }

 src/views/securityGuard/securityGuard.vue

@@ -740,6 +740,13 @@
                type: "date",
                format: "yyyy-MM-dd",
                valueFormat: "yyyy-MM-dd",
                rules: [
                  {
                    required: true,
                    message: "请输入入职时间",
                    trigger: "click",
                  },
                ],
              },
              {
                label: "性别",