|
@@ -228,11 +228,9 @@
|
|
|
clearable
|
|
|
size="small"
|
|
|
v-model="form.blogDate"
|
|
|
- type="date"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
+ type="datetime"
|
|
|
placeholder="选择值班日期"
|
|
|
class="text"
|
|
|
- :editable="false"
|
|
|
@change="blogDate"
|
|
|
>
|
|
|
</el-date-picker>
|
|
@@ -789,9 +787,7 @@ import {
|
|
|
getDept,
|
|
|
getZhuChiRen,
|
|
|
getUser,
|
|
|
- getBdgDay,
|
|
|
getShiLi,
|
|
|
- getRed,
|
|
|
getXunLian,
|
|
|
getWeiShu,
|
|
|
} from "@/api/grassrootsregistration/bdglmeeting";
|
|
@@ -1083,7 +1079,19 @@ export default {
|
|
|
},
|
|
|
// 获取训练
|
|
|
XunLian(id, tiem) {
|
|
|
- getXunLian(id, tiem).then((res) => {
|
|
|
+ let y = tiem.getFullYear();
|
|
|
+ let m = tiem.getMonth() + 1;
|
|
|
+ m = m < 10 ? "0" + m : m;
|
|
|
+ let d = tiem.getDate();
|
|
|
+ d = d < 10 ? "0" + d : d;
|
|
|
+ let h = tiem.getHours();
|
|
|
+ h = h < 10 ? "0" + h : h;
|
|
|
+ let M = tiem.getMinutes();
|
|
|
+ M = M < 10 ? "0" + M : M;
|
|
|
+ let s = tiem.getSeconds();
|
|
|
+ s = s < 10 ? "0" + s : s;
|
|
|
+ let dateTime = y + "-" + m + "-" + d + " " + h + ":" + M + ":" + s;
|
|
|
+ getXunLian(id, dateTime).then((res) => {
|
|
|
this.xunlian = res.data;
|
|
|
});
|
|
|
},
|
|
@@ -1167,7 +1175,7 @@ export default {
|
|
|
]);
|
|
|
},
|
|
|
// 当点击完成值班时间的选择发起请求
|
|
|
- blogDate() {
|
|
|
+ blogDate(data) {
|
|
|
// 判断是否全部选择
|
|
|
if (this.form.unitId !== null && this.form.blogDate !== null) {
|
|
|
this.XunLian(this.form.unitId, this.form.blogDate);
|
|
@@ -1391,7 +1399,6 @@ export default {
|
|
|
this.style = style;
|
|
|
this.$refs["form"].validate((valid) => {
|
|
|
if (valid) {
|
|
|
- this.form.inspect = this.checkShop;
|
|
|
if (
|
|
|
(this.relatives[0].name ||
|
|
|
this.relatives[0].peopleId ||
|
|
@@ -1407,7 +1414,15 @@ export default {
|
|
|
});
|
|
|
} else {
|
|
|
// 查铺查哨
|
|
|
- this.form.inspect = this.checkShop;
|
|
|
+ if (
|
|
|
+ this.checkShop[0].peopleName !== null ||
|
|
|
+ this.checkShop[0].sentryName !== null ||
|
|
|
+ this.checkShop[0].examineDate !== null ||
|
|
|
+ this.checkShop[0].foremanName !== null ||
|
|
|
+ this.checkShop[0].dialogue != null
|
|
|
+ ) {
|
|
|
+ this.form.inspect = this.checkShop;
|
|
|
+ }
|
|
|
// 来对亲属
|
|
|
if (this.relatives[0].peopleId !== null) {
|
|
|
this.form.kinsfolk = this.relatives;
|
|
@@ -1511,10 +1526,10 @@ export default {
|
|
|
.el-select-dropdown__item:hover {
|
|
|
background-color: #196299;
|
|
|
}
|
|
|
-.el-select-dropdown__item.hover,
|
|
|
+/* .el-select-dropdown__item.hover,
|
|
|
.el-select-dropdown__item:hover {
|
|
|
color: #fff !important;
|
|
|
-}
|
|
|
+} */
|
|
|
::v-deep .el-dialog__body {
|
|
|
margin: 10px 0px 20px 50px;
|
|
|
padding-top: 20px !important;
|
|
@@ -1742,20 +1757,24 @@ export default {
|
|
|
}
|
|
|
/* 表单长度 */
|
|
|
::v-deep .box3 .el-form-item__content {
|
|
|
- width: 140px;
|
|
|
+ width: 167px;
|
|
|
+ display: flex;
|
|
|
}
|
|
|
::v-deep .box3 .el-input__inner {
|
|
|
- width: 138px;
|
|
|
+ width: 164px;
|
|
|
height: 37px;
|
|
|
}
|
|
|
+.box3 .el-button:nth-child(1) {
|
|
|
+ margin-left: 795px;
|
|
|
+}
|
|
|
/* 添加删除按钮 */
|
|
|
::v-deep .box3 .el-button {
|
|
|
width: 32px;
|
|
|
height: 32px;
|
|
|
text-align: center;
|
|
|
- margin-left: -6px;
|
|
|
margin-right: 3px;
|
|
|
- margin-left: 8px;
|
|
|
+ margin-top: 10px;
|
|
|
+ margin-bottom: 10px;
|
|
|
}
|
|
|
::v-deep .box3 .el-button .el-icon-plus {
|
|
|
margin-left: -6px;
|
|
@@ -1774,6 +1793,9 @@ export default {
|
|
|
::v-deep .box3 .el-form-item__content .el-input__inner {
|
|
|
padding: 0px 15px;
|
|
|
}
|
|
|
+.box3 .el-form-item {
|
|
|
+ margin-bottom: 0px;
|
|
|
+}
|
|
|
|
|
|
.el-dialog__body {
|
|
|
color: #fff;
|