Quellcode durchsuchen

修改默认时间

凉纪 vor 1 Jahr
Ursprung
Commit
b7243144ea

+ 15 - 15
src/views/core/accessPlan/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-row :gutter="10">
       <!--机构数据-->
-  
+
       <!--搜索栏-->
       <el-col :span="24" :xs="24">
         <div class="main-right-box">
@@ -215,7 +215,7 @@
                 />
               </template>
             </el-table-column>
-          
+
             <el-table-column
               label="操作"
               fixed="right"
@@ -301,7 +301,7 @@
         </el-form-item>
 
         <el-form-item label="机构类型" prop="orgType">
-        
+
           <el-select
           :disabled="form.isEdit || form.isComplete"
             style="width: 100%"
@@ -314,7 +314,7 @@
               :key="dict.value"
               :label="dict.label"
               :value="`${dict.value}`"
-            
+
             ></el-option>
           </el-select>
         </el-form-item>
@@ -330,7 +330,7 @@
               :key="dict.value"
               :label="dict.label"
               :value="`${dict.value}`"
-            
+
             ></el-option>
           </el-select>
         </el-form-item>
@@ -347,7 +347,7 @@
               :key="item.id"
               :label="item.roleName"
               :value="item.id"
-            
+
             ></el-option>
           </el-select>
         </el-form-item>
@@ -439,7 +439,7 @@
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
- 
+
       </div>
     </DialogCom>
     <DialogThreeState ref="DialogThreeState"> </DialogThreeState>
@@ -745,7 +745,7 @@ export default {
                 this.$modal
          .confirm("因存在已完成任务,无周期任务如需修改,请删除后重新下发”。")
          .then(() => {
-             
+
                 this.open = false;
                 this.getList();
 
@@ -766,7 +766,7 @@ export default {
               .catch(() => {
               });
               }
-              
+
               }else{
                 if (request.isHaveTask==false) {
                   msg = "是否确认修改?";
@@ -785,7 +785,7 @@ export default {
               });
                 }else{
                   msg =  "因不存在已完成任务,本次修改内容将立即生效";
-              
+
               this.$modal
             .confirm(msg)
             .then(function () {
@@ -800,9 +800,9 @@ export default {
             .catch(() => {
             });
                 }
-             
+
               }
-              
+
             }else{
               msg = "是否确认修改?";
               this.$modal
@@ -956,7 +956,7 @@ export default {
     },
     handWithdraw(row) {
       if (row.isComplete) {
-   
+
         this.$modal
         .confirm("因不存在已完成任务,撤回后将删除所有生成任务")
         .then(function () {
@@ -973,7 +973,7 @@ export default {
          .confirm("存在已完成任务,无周期任务不允许撤回,如需删除下发任务请点击“删除”。")
          .then(() => {
           this.getList();
-       
+
         })
         }else{
           this.$modal
@@ -987,7 +987,7 @@ export default {
         })
         .catch(() => {});
         }
-   
+
       }
 
     },

+ 1 - 1
src/views/core/drill/task/index.vue

@@ -356,7 +356,7 @@ export default {
         orgId: this.$store.getters.orgId,
         type: null,
         status: null,
-        range: [new Date(),new Date()],
+        range: [],
       },
       // 表单参数
       form: {},

+ 2 - 1
src/views/core/edu/task/index.vue

@@ -21,6 +21,7 @@
                   @defaultOrg="getDefaultOrg"
                   @checkChange="checkChange"
                   @click="clickTreeNode"
+                  :defaultCheckSub="true"
                   ref="orgTree"
                 ></org-tree>
               </el-form-item>
@@ -355,7 +356,7 @@ export default {
         orgId: this.$store.getters.orgId,
         type: null,
         status: null,
-        range:  [new Date(),new Date()],
+        range: [],
       },
       // 表单参数
       form: {},

+ 20 - 17
src/views/core/outIn/letter/dialog.addletter.vue

@@ -22,7 +22,7 @@
                   maxlength="15"
                 />
               </el-form-item>
-            </el-col>            
+            </el-col>
             <el-col :span="12">
               <el-form-item label="接待机构" prop="receptionOrgIds">
                 <org-tree-select v-model="formData.receptionOrgIds" ref="orgTreeSelect" :checkShow="true">
@@ -37,7 +37,7 @@
                   maxlength="100"
                 />
               </el-form-item>
-            </el-col>            
+            </el-col>
             <el-col :span="12">
               <el-form-item prop="startTime" label="开具日期">
                 <!-- <el-date-picker
@@ -91,7 +91,7 @@
                 <h3>
                   <i class="el-icon-collection-tag"></i>
                   人员信息
-                </h3> 
+                </h3>
             </el-col>
             <el-col :offset="8" :span="2">
               <h3>
@@ -102,8 +102,8 @@
                 @click="handleAddUser"
                 >新增来访人员</el-button
               >
-                </h3> 
-             
+                </h3>
+
             </el-col>
           </el-row>
 
@@ -119,9 +119,9 @@
             <el-table-column label="证件号码" width="200" align="center" prop="idCard">
             </el-table-column>
             <el-table-column label="证件图片" align="center" prop="imgFile">
-              <template slot-scope="scope">                      
-                      <ImageListPreview v-model="scope.row.imgFile"></ImageListPreview>                  
-                    </template> 
+              <template slot-scope="scope">
+                      <ImageListPreview v-model="scope.row.imgFile"></ImageListPreview>
+                    </template>
                </el-table-column>
             <el-table-column
               label="操作"
@@ -142,7 +142,7 @@
       </div>
 
       <DialogCom
-        title="添加来访人员"
+        :title="userPageTitle"
         :visible.sync="open"
         width="600px"
         append-to-body
@@ -153,7 +153,7 @@
           :model="userInfo"
           :rules="userInfoRules"
           label-width="120px"
-        >  
+        >
           <el-form-item label="来访单位" prop="companyName">
             <el-input v-model="userInfo.companyName" maxlength="20" placeholder="请输入来访单位" />
           </el-form-item>
@@ -219,8 +219,8 @@ export default {
         reasons: [{ required: true, message: "请输入来访事由" }],
         letterNo: [{ required: true, message: "请输入介绍信编号" }],
         receptionOrgIds: [{ required: true, message: "请选择接待机构" }],
-        startTime: [{ required: true, message: "请选择开具日期" }],      
-        effectiveDays: [{ required: true, message: "请选择有效天数" }],   
+        startTime: [{ required: true, message: "请选择开具日期" }],
+        effectiveDays: [{ required: true, message: "请选择有效天数" }],
         userInfos: [{ required: true, message: "请添加来访人员" }],
         letterFile:[{ required: true, message: "请上传介绍信附件" }],
       },
@@ -264,6 +264,7 @@ export default {
         description: null,
         letterFile: [],
         userInfos: [],
+        userPageTitle:null,
         type:1,
         status:0,
         ...other,
@@ -279,9 +280,9 @@ export default {
       };
     },
 
-    async show(id, other = {}) {     
+    async show(id, other = {}) {
       if (id) {
-        this.title = "编辑介绍信";   
+        this.title = "编辑介绍信";
         this.isShow = true;
         getLetter(id).then((response) => {
           // let tempRange=[];
@@ -290,16 +291,17 @@ export default {
           // response.data.range=tempRange;
           this.formData = response.data;
           this.formFileListDefualtValue=this.formData.letterFile;
-        });        
+        });
       }
-      else 
+      else
       {
         this.isShow = true;
         this.title = "录入介绍信";
-        this.formData = this.reset();       
+        this.formData = this.reset();
       }
     },
     handleAddUser() {
+      this.userPageTitle = '添加来访人员';
       this.open = true;
     },
     imageListChanged(list) {
@@ -389,6 +391,7 @@ export default {
       });
     },
     editUser(row) {
+      this.userPageTitle = '编辑来访人员'
       this.open = true;
       this.userInfo = row;
     },

+ 1 - 1
src/views/safetycheck/task/index.vue

@@ -453,7 +453,7 @@ export default {
         title: null,
         roleId: null,
         checkOrgIds: null,
-        range: [new Date(), new Date()],
+        range: [],
       },
       selectedOrgName: null,
       pageData: [],