履职下发调试

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

@@ -267,7 +267,6 @@
       </div>
 
       <div slot="footer" class="dialog-footer">
-       
         <el-button type="primary" @click="onSubmit">确定</el-button>
         <el-button @click="onHide">取消</el-button>
       </div>
@@ -316,7 +315,7 @@ export default {
       execOrgType: null,
       roleNames: null,
       planExec: null,
-      defbuildTaskNow:false,
+      defbuildTaskNow: false,
       count: 0,
       description: null,
       propItem: "",
@@ -432,6 +431,10 @@ export default {
       this.selectedRows = [];
     },
     changeBuildTime() {
+      if(this.formData.planCycle==null){
+        this.buildTime=null;
+        return;
+      }
       // console.log(this.formData.planCycle, "this.formData.planCycle");
       const dateObj = new Date(); // 获取当前时间对象
       switch (this.formData.planCycle) {
@@ -621,6 +624,21 @@ export default {
           //履职内容
           this.tableData = null;
           break;
+        case "8": //其它
+          //周期
+          this.formData.planCycle = null;
+          //机构类型
+          this.formData.execOrgType = null;
+          this.resumptionRoles = [];
+          //角色
+          this.formData.roleList = [];
+          //履职时间
+          this.formData.planExec = null;
+          //履职次数
+          this.formData.count = 1;
+          //履职内容
+          this.tableData = null;
+          this.$refs["form"].resetFields();
       }
       this.changeBuildTime();
     },
@@ -733,7 +751,7 @@ export default {
       // console.log(id);
       if (id !== undefined) {
         await api.get(id).then((res) => {
-          this.defbuildTaskNow=res.data.buildTaskNow> 0 ? true : false;;
+          this.defbuildTaskNow = res.data.buildTaskNow > 0 ? true : false;
           this.tempBuildTaskNow = res.data.buildTaskNow > 0 ? true : false;
           this.parentCount = res.data.parentCount;
           // console.log(res, "res");

src/views/resumption/ruleManager/dialog.select.point.vue

@@ -121,7 +121,12 @@ export default {
     },
   },
   methods: {
-    show(defaultSelect) {      
+    show(defaultSelect) {     
+      if(this.orgType==null) {
+        this.prevOrgType=this.orgType;
+        this.$modal.alert("请选择机构类型");
+        return;
+      }
       this.isShow = true;
       if (defaultSelect && defaultSelect.map) {
         this.selectList = defaultSelect.map((s) => ({ id: s }));

src/views/safetycheck/ruleManager/dialog.select.point.vue

@@ -23,6 +23,13 @@
       >
         <!-- 搜索 -->
         <template slot="searchs">
+          <el-form-item prop="key" label="关键字">
+            <el-input
+              v-model="search.key"
+              maxlength="50"
+              placeholder="请输入检查项或检查内容"
+            ></el-input>
+          </el-form-item>
           <el-form-item prop="ruleId" label="检查内容库">
             <el-select v-model="search.ruleId">
               <el-option
@@ -32,14 +39,7 @@
                 :label="item.name"
               ></el-option>
             </el-select>
-          </el-form-item>
-          <el-form-item prop="key" label="关键字">
-            <el-input
-              v-model="search.key"
-              maxlength="50"
-              placeholder="请输入检查项或检查内容"
-            ></el-input>
-          </el-form-item>
+          </el-form-item>         
         </template>
 
         <!-- 表格 -->

src/views/system/dict/data.vue

@@ -6,7 +6,7 @@
       size="small"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
+      label-width="100px"
     >
       <el-form-item label="字典名称" prop="dictType">
         <el-select v-model="queryParams.dictType">
@@ -200,7 +200,7 @@
 
     <!-- 添加或修改参数配置对话框 -->
     <DialogCom :title="title" :visible.sync="open" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="字典类型">
@@ -208,15 +208,15 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="数据标签" prop="dictLabel">
-              <el-input v-model="form.dictLabel" placeholder="请输入数据标签" />
+            <el-form-item label="字典标签" prop="dictLabel">
+              <el-input v-model="form.dictLabel" placeholder="请输入字典标签" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="数据键值" prop="dictValue">
-              <el-input v-model="form.dictValue" placeholder="请输入数据键值" />
+            <el-form-item label="字典键值" prop="dictValue">
+              <el-input v-model="form.dictValue" placeholder="请输入字典键值" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -227,7 +227,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="显示排序" prop="dictSort">
+            <el-form-item label="字典排序" prop="dictSort">
               <el-input-number
                 style="width: 100%"
                 v-model="form.dictSort"
@@ -319,7 +319,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      // 数据标签回显样式
+      // 字典标签回显样式
       listClassOptions: [
         {
           value: "default",
@@ -361,13 +361,13 @@ export default {
       // 表单校验
       rules: {
         dictLabel: [
-          { required: true, message: "数据标签不能为空", trigger: "blur" },
+          { required: true, message: "字典标签不能为空", trigger: "blur" },
         ],
         dictValue: [
-          { required: true, message: "数据键值不能为空", trigger: "blur" },
+          { required: true, message: "字典键值不能为空", trigger: "blur" },
         ],
         dictSort: [
-          { required: true, message: "数据顺序不能为空", trigger: "blur" },
+          { required: true, message: "字典排序不能为空", trigger: "blur" },
         ],
       },
     };

src/views/system/dict/index.vue

@@ -155,7 +155,7 @@
     <!-- 添加或修改参数配置对话框 -->
     <DialogCom :title="title" :visible.sync="open" width="650px" append-to-body>
 
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
 
         <el-form-item label="字典名称" prop="dictName">
           <el-input v-model="form.dictName" placeholder="请输入字典名称" />