Merge branch 'xqx' of yinet2020/YinetOASystemWeb into master

src/views/system/actform/fawen/iWebOffice.vue

@@ -89,7 +89,7 @@
             0xdbdbdb,
             0x000000)) {
             // alert("插件皮肤发生错误，请新打开!");
-            this.msgError("插件皮肤发生错误，请新打开!");
+            this.msgError("插件加载失败，请新打开!");
 
             // this.msgSuccess(this.webOfficeObj.Status);
           }    //设置控件皮肤
@@ -107,7 +107,7 @@
           this.webOfficeObj.AddCustomMenu();
           this.webOfficeObj.HookEnabled();
           // this.webOfficeObj.CreateFile() // 根据FileType设置的扩展名来创建对应的空白文档
-          },1000)
+          },2000)
         } catch (e) {
           console.log("catch");
           console.log(e.description);

src/views/system/actwork/actManager.vue

@@ -22,19 +22,17 @@
             />
           </el-form-item>
           <el-form-item label="创建时间" prop="starttime">
-            <el-date-picker clearable size="small" style="width: 200px"
-                            v-model="queryParams.starttime"
-                            type="date"
-                            value-format="yyyy-MM-dd"
-                            placeholder="选择开始时间">
-            </el-date-picker>
-            至
-            <el-date-picker clearable size="small" style="width: 200px"
-                            v-model="queryParams.endtime"
-                            type="date"
-                            value-format="yyyy-MM-dd"
-                            placeholder="选择结束时间">
-            </el-date-picker>
+
+            <el-date-picker
+              v-model="setime"
+              size="small"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -274,6 +272,7 @@
         },
         // 表单参数
         form: {},
+        setime:[],
         // 表单校验
         // rules: {},
         deleteActkey:'',
@@ -384,13 +383,15 @@
       },
       /** 搜索按钮操作 */
       handleQuery() {
+        this.queryParams.endtime =this.setime[0]
+        this.queryParams.startime = this.setime[1]
         this.queryParams.pageNum = 1
         this.getAllList()
       },
       /** 重置按钮操作 */
       resetQuery() {
-        this.queryParams.endtime = ""
-        this.queryParams.person = ""
+        this.queryParams.person = undefined;
+        this.setime=[];
         this.resetForm('queryForm')
         this.handleQuery()
       },

src/views/system/actwork/havedone.vue

@@ -13,21 +13,16 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="办理时间" prop="sendtime">
-            <el-date-picker clearable size="small" style="width: 200px"
-                            v-model="queryParams.startime"
-                            type="date"
-                            value-format="yyyy-MM-dd"
-                            placeholder="选择开始时间">
-            </el-date-picker>
-            至
-            <el-date-picker clearable size="small" style="width: 200px"
-                            v-model="queryParams.endtime"
-                            type="date"
-                            value-format="yyyy-MM-dd"
-                            placeholder="选择结束时间">
-            </el-date-picker>
-          </el-form-item>
+          <el-date-picker
+            v-model="setime"
+            size="small"
+            style="width: 240px"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -160,6 +155,7 @@
           formId:'',
           flg:'2'},
         actForm: null,
+        setime: [],
         // 遮罩层
         loading: true,
         // 选中数组
@@ -283,12 +279,13 @@
       /** 搜索按钮操作 */
       handleQuery() {
         this.queryParams.pageNum = 1;
+        this.queryParams.startime =this.setime[0]
+        this.queryParams.endtime = this.setime[1]
         this.getList();
       },
       /** 重置按钮操作 */
       resetQuery() {
-        this.queryParams.endtime="";
-        this.queryParams.startime="";
+        this.setime=[];
         this.resetForm("queryForm");
         this.handleQuery();
       },

src/views/system/actwork/meapply.vue

@@ -13,19 +13,16 @@
             />
           </el-form-item>
           <el-form-item label="创建时间" prop="sendtime">
-            <el-date-picker clearable size="small" style="width: 200px"
-                            v-model="queryParams.createtime"
-                            type="date"
-                            value-format="yyyy-MM-dd"
-                            placeholder="选择开始时间">
-            </el-date-picker>
-            至
-            <el-date-picker clearable size="small" style="width: 200px"
-                            v-model="queryParams.doneTime"
-                            type="date"
-                            value-format="yyyy-MM-dd"
-                            placeholder="选择结束时间">
-            </el-date-picker>
+            <el-date-picker
+              v-model="setime"
+              size="small"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -181,6 +178,7 @@
         // 选中数组
         ids: [],
         flgs: [],
+        setime: [],
         // 非单个禁用
         single: true,
         // 非多个禁用
@@ -317,14 +315,14 @@
       /** 搜索按钮操作 */
       handleQuery() {
         this.queryParams.pageNum = 1
+        this.queryParams.createtime=this.setime[0];
+        this.queryParams.doneTime=this.setime[1];
         this.getList()
 
-
       },
       /** 重置按钮操作 */
       resetQuery() {
-        this.queryParams.createtime=undefined;
-        this.queryParams.doneTime=undefined;
+        this.setime=[];
         this.resetForm("queryForm");
         this.handleQuery();
       },

src/views/system/actwork/todo.vue

@@ -33,19 +33,16 @@
             />
           </el-form-item>
           <el-form-item label="到达时间" prop="sendtime">
-            <el-date-picker clearable size="small" style="width: 200px"
-                            v-model="toDoParams.startime"
-                            type="date"
-                            value-format="yyyy-MM-dd"
-                            placeholder="选择开始时间">
-            </el-date-picker>
-            至
-            <el-date-picker clearable size="small" style="width: 200px"
-                            v-model="toDoParams.endtime"
-                            type="date"
-                            value-format="yyyy-MM-dd"
-                            placeholder="选择结束时间">
-            </el-date-picker>
+            <el-date-picker
+              v-model="setime"
+              size="small"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -137,6 +134,7 @@
         ],
         // 弹出层标题
         title: "",
+        setime: [],
         // 是否显示弹出层
         open: false,
         actForm: null,
@@ -232,12 +230,13 @@
       /** 搜索按钮操作 */
       handleQuery() {
         this.toDoParams.pageNum = 1;
+        this.toDoParams.startime = this.setime[0];
+        this.toDoParams.endtime =this.setime[1];
         this.getList();
       },
       /** 重置按钮操作 */
       resetQuery() {
-        this.toDoParams.startime = undefined;
-        this.toDoParams.endtime = undefined;
+        this.setime=[];
         this.resetForm("queryForm");
         this.handleQuery();
       },