履职立即执行

src/views/check/dialog.edit.vue

@@ -154,7 +154,7 @@
           <el-row>
             <el-col :span="6">
               <el-form-item prop="planStatus" label="计划状态">
-                <el-select
+                <!-- <el-select
                   label="计划状态"
                   v-model="formData.planStatus"
                   placeholder="请选择计划状态"
@@ -167,7 +167,8 @@
                     :value="item.value"
                   >
                   </el-option>
-                </el-select>
+                </el-select> -->
+                <el-switch v-model="formData.planStatus" active-value="1" inactive-value="2"></el-switch>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -217,7 +218,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="是否必检">
+          <el-table-column label="必完成项">
             <template v-slot="{ row }">
               <el-switch
                 v-model="row.required"
@@ -441,7 +442,7 @@ export default {
     onSelect(selectList) {
       for (let i = 0; i < selectList.length; i++) {
         let tem = {
-          pointScan: !selectList[i].pointScan,
+          pointScan: selectList[i].pointScan,
           required: !selectList[i].required,
           ruleName: selectList[i].ruleName,
           itemName: selectList[i].itemName,

src/views/check/index.vue

@@ -100,7 +100,7 @@
             />
           </el-form-item>
           <el-form-item prop="planStatus" label="计划状态">
-            <el-select
+            <!-- <el-select
               prop="planStatus"
               label="计划状态"
               v-model="queryParams.planStatus"
@@ -114,7 +114,8 @@
                 :value="item.value"
               >
               </el-option>
-            </el-select>
+            </el-select> -->
+            <el-switch v-model="queryParams.planStatus" active-value="1" inactive-value="2"></el-switch>
           </el-form-item>
           <el-form-item>
             <el-button

src/views/resumption/plan/dialog.edit.vue

@@ -67,7 +67,7 @@
             </el-col>
             <el-col :span="6">
               <el-form-item prop="planStatus" label="计划状态:">
-                <el-select 
+                <!-- <el-select 
                   :disabled="getDistributePlanStatus()"
                   prop="planStatus"
                   label="计划状态"
@@ -82,7 +82,8 @@
                     :value="item.value"
                   >
                   </el-option>
-                </el-select>
+                </el-select> -->
+                <el-switch v-model="formData.planStatus" active-value="1" inactive-value="0"></el-switch>
               </el-form-item>
             </el-col>
           </el-row>
@@ -146,6 +147,22 @@
                 </el-select>
               </el-form-item>
             </el-col>
+
+            <el-col :span="6">
+              <el-form-item prop="buildTaskNow" label="立即生效:">
+                <el-checkbox
+                :disabled="id ?true:false"
+                  v-model="formData.buildTaskNow"
+                  size="medium"
+                  @change="handleCheckboxChange"
+                  >勾选后当前周期开始生效</el-checkbox
+                >
+              </el-form-item>
+            </el-col>
+
+
+
+
             <el-col :span="6">
               <el-form-item prop="count" label="履职次数:" v-if="false">
                 <el-input-number
@@ -183,7 +200,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="必须履职">
+          <el-table-column label="必完成项">
             <template v-slot="{ row }">
               <el-switch
                 v-model="row.required"
@@ -269,7 +286,7 @@ export default {
           prop: "itemId",
         },
         {
-          label: "必须履职",
+          label: "必完成项",
           prop: "required",
         },
         {
@@ -498,8 +515,11 @@ export default {
         roleList: null,
         distributePlanStatus: null,
         planCreateOrgType: null,
+        buildTaskNow:false,
       };
     },
+    handleCheckboxChange() {
+    },
     getRolesByOrg() {
       if(this.formData.execOrgType!=null){
       let params = {

src/views/resumption/plan/index.vue

@@ -74,7 +74,7 @@
             </el-select>
           </el-form-item>
           <el-form-item prop="planStatus" label="计划状态">
-            <el-select
+            <!-- <el-select
               prop="planStatus"
               label="任务状态"
               v-model="queryParams.planStatus"
@@ -88,7 +88,8 @@
                 :value="item.value"
               >
               </el-option>
-            </el-select>
+            </el-select> -->
+            <el-switch v-model="queryParams.planStatus" active-value="1" inactive-value="0"></el-switch>
           </el-form-item>
           <el-form-item prop="planName" label="计划名称">
             <el-input

src/views/system/dept/extend.vue

@@ -1522,7 +1522,7 @@ export default {
     handleBusinessAdd() {
       this.Businessreset();
       this.Businessopen = true;
-      this.Businesstitle = "新增物防建设";
+      this.Businesstitle = "新增安全防范设施建设达标情况";
     },
     /** 编辑按钮操作 */
     handleBusinessUpdate(row) {
@@ -1531,7 +1531,7 @@ export default {
       getOrgPhysicalDefenseConstruction(id).then((response) => {
         this.Businessform = response.data;
         this.Businessopen = true;
-        this.Businesstitle = "编辑物防建设";
+        this.Businesstitle = "编辑安全防范设施建设达标情况";
       });
     },
     /** 提交按钮 */
@@ -1625,7 +1625,7 @@ export default {
     handleBankAdd() {
       this.Bankreset();
       this.Bankopen = true;
-      this.Banktitle = "新增物防建设";
+      this.Banktitle = "新增安全防范设施建设达标情况";
     },
     /** 编辑按钮操作 */
     handleBankUpdate(row) {
@@ -1634,7 +1634,7 @@ export default {
       getOrgPhysicalDefenseConstruction(id).then((response) => {
         this.Bankform = response.data;
         this.Bankopen = true;
-        this.Banktitle = "编辑物防建设";
+        this.Banktitle = "编辑安全防范设施建设达标情况";
       });
     },
     /** 提交按钮 */
@@ -1726,7 +1726,7 @@ export default {
     handledetachedAdd() {
       this.detachedreset();
       this.detachedopen = true;
-      this.detachedtitle = "新增物防建设";
+      this.detachedtitle = "新增安全防范设施建设达标情况";
     },
     /** 编辑按钮操作 */
     handledetachedUpdate(row) {
@@ -1735,7 +1735,7 @@ export default {
       getOrgPhysicalDefenseConstruction(id).then((response) => {
         this.detachedform = response.data;
         this.detachedopen = true;
-        this.detachedtitle = "编辑物防建设";
+        this.detachedtitle = "编辑安全防范设施建设达标情况";
       });
     },
     /** 提交按钮 */
@@ -1827,7 +1827,7 @@ export default {
     handleOrgAdd() {
       this.orgreset();
       this.orgopen = true;
-      this.orgtitle = "新增物防建设";
+      this.orgtitle = "新增安全防范设施建设达标情况";
     },
     /** 编辑按钮操作 */
     handleOrgUpdate(row) {
@@ -1837,7 +1837,7 @@ export default {
         // console.log(response)
         this.orgform = response.data;
         this.orgopen = true;
-        this.orgtitle = "编辑物防建设";
+        this.orgtitle = "编辑安全防范设施建设达标情况";
       });
     },
     /** 提交按钮 */

src/views/system/workTimeSet/workTime.vue

@@ -15,7 +15,7 @@
 
           <!--    搜索条件    -->
           <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item label="日期范围">
+            <el-form-item label="起止日期">
               <el-date-picker
                 v-model="queryParams.range"
                 style="width: 240px"