Merge remote-tracking branch 'remotes/origin/V0.0.4' into V0.0.5

.env.development

@@ -6,11 +6,19 @@ ENV = 'development'
 
 # 开发环境
 #测试地址
-VUE_APP_BASE_API = 'http://47.92.229.224:8080'
+<<<<<<< HEAD
+#VUE_APP_BASE_API = 'http://47.92.229.224:8080'
 #罗俊
 #VUE_APP_BASE_API = 'http://10.87.21.60:8080'
 #罗伟
-#  VUE_APP_BASE_API = 'http://10.87.23.62:8080'
+  VUE_APP_BASE_API = 'http://10.87.23.62:8080'
+=======
+# VUE_APP_BASE_API = 'http://47.92.229.224:8080'
+#罗俊
+#VUE_APP_BASE_API = 'http://10.87.21.60:8080'
+#罗伟
+ VUE_APP_BASE_API = 'http://10.87.23.62:8080'
+>>>>>>> d909b77fe3593021b73d72d6276f6df848c73f8a
 #高雄
 #VUE_APP_BASE_API = 'http://10.87.11.94:8080'
 #景远超

package.json

@@ -40,24 +40,24 @@
     "@riophae/vue-treeselect": "0.4.0",
     "axios": "0.24.0",
     "clipboard": "2.0.8",
-    "core-js": "^3.34.0",
     "core.js": "^0.4.2",
     "dayjs": "^1.11.9",
     "echarts": "5.4.0",
     "element-ui": "2.15.12",
     "file-saver": "2.0.5",
     "fuse.js": "6.4.3",
+    "gm-crypt": "0.0.2",
     "highlight.js": "10.7.3",
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
+    "moment": "^2.29.4",
     "node-polyfill-webpack-plugin": "^3.0.0",
     "nprogress": "0.2.0",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",
     "vue": "2.6.12",
-    "gm-crypt": "0.0.2",
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.5",
     "vue-meta": "2.4.0",
@@ -73,6 +73,7 @@
     "chalk": "4.1.0",
     "compression-webpack-plugin": "5.0.2",
     "connect": "3.6.6",
+    "core-js": "^3.34.0",
     "html-webpack-plugin": "^5.5.3",
     "lint-staged": "10.5.3",
     "runjs": "4.4.2",

src/assets/styles/ruoyi.scss

@@ -389,6 +389,10 @@
        }
      }
    }
+   .el-table{
+	box-shadow: none !important;
+
+   }
  }
  .vue-treeselect__single-value{
    align-items: center;

src/components/ImageListPreview/index.vue

@@ -30,10 +30,11 @@
         </div>
       </div>
   </div>
-   </div> 
+   </div>
 </template>
 
 <script>
+import {imageUrl} from "@/utils/ruoyi";
 export default {
   name: "ImageListPreview",
   data() {
@@ -48,10 +49,15 @@ export default {
       handler(newVal) {
         if(newVal){
         const list = Array.isArray(newVal) ? newVal : this.value.split(",");
-        this.fileList = list.map((url) => ({ name: url, url }));
-        this.previewSrcList=list.map((url) => url);
-        console.log("this.fileList",this.fileList,this.previewSrcList);
-      }        
+        this.fileList = list.map((url) => (
+          {
+            name: url,
+            url :url.indexOf('http') > -1 ?   url : imageUrl(url),
+          }
+        ));
+        this.previewSrcList = this.fileList.map((img) => img.url);
+        console.log("fileList",this.fileList,this.previewSrcList);
+      }
         else{
           this.fileList =[];
           this.previewSrcList=[];

src/components/K-FileUpload/index.vue

@@ -32,7 +32,7 @@
     <!-- 详情页面显示列表 -->
     <transition-group v-if="!isShowUploadBtn" class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
       <li :key="file.url" class="el-upload-list__item ele-upload-list__item-content" v-for="(file) in fileList">
-        <el-link :href="file.url" :underline="false" target="_blank">
+        <el-link :href="file.url.indexOf('http') > -1? file.url: imageUrl(file.url)" :underline="false" target="_blank">
           <span class="el-icon-document"> {{ file.name }} </span>
         </el-link>
       </li>
@@ -43,6 +43,7 @@
 <script>
 import { getToken } from "@/utils/auth";
 import { upload } from "@/api/system/public";
+import {imageUrl} from "@/utils/ruoyi";
 
 export default {
   name: "K-FileUpload",
@@ -149,6 +150,7 @@ export default {
     },
   },
   methods: {
+    imageUrl,
 
     getAcceptByFileType()
     {
@@ -309,7 +311,7 @@ export default {
       clearFiles(){
         if(this.$refs["fileUpload"])
           this.$refs["fileUpload"].clearFiles();
-        
+
         this.fileList = [];
         this.fileValueList = [];
       },

src/store/modules/user.js

@@ -78,6 +78,7 @@ const user = {
     Login({ commit }, userInfo) {
       const username = userInfo.username.trim()
       const password = SM4Encrypt(userInfo.password)
+      // const password = (userInfo.password)
       const code = userInfo.code
       const uuid = userInfo.uuid
       return new Promise((resolve, reject) => {

src/views/core/accessPlan/index.vue

@@ -122,7 +122,6 @@
                   size="mini"
                   @click="handleAdd"
                   v-hasPermi="['core:accessPlan:add']"
-                  v-if="check == true"
                   >新增任务
                 </el-button>
               </el-col>
@@ -239,7 +238,7 @@
                     (scope.row.planStatus == 0 || scope.row.planStatus == 2)
                   "
                   @click="handDistribute(scope.row)"
-                  v-hasPermi="['core:accessPlan:add']"
+                  v-hasPermi="['core:accessPlan:release']"
                   >下发
                 </el-button>
                 <el-button
@@ -253,6 +252,7 @@
                     scope.row.parentId == null
                   "
                   @click="handWithdraw(scope.row)"
+                  v-hasPermi="['core:accessPlan:withdraw']"
                   >撤回
                 </el-button>
                 <el-button
@@ -260,7 +260,7 @@
                   type="text"
                   icon="el-icon-edit-outline"
                   @click="handleUpdate(scope.row)"
-                  v-if="scope.row.orgId == isEdit && check == true"
+                  v-if="scope.row.orgId == isEdit"
                   v-hasPermi="['core:accessPlan:edit', 'core:accessPlan:query']"
                   >编辑
                 </el-button>
@@ -270,8 +270,7 @@
                   type="text"
                   v-if="
                     scope.row.parentOrgId == isEdit &&
-                    scope.row.parentId == null &&
-                    check == true
+                    scope.row.parentId == null 
                   "
                   icon="el-icon-delete"
                   @click="handleDelete(scope.row)"

src/views/core/drill/task/index.vue

@@ -356,7 +356,7 @@ export default {
         orgId: this.$store.getters.orgId,
         type: null,
         status: null,
-        range: null,
+        range: [new Date(),new Date()],
       },
       // 表单参数
       form: {},
@@ -428,7 +428,7 @@ export default {
       this.queryParams.title = null;
       this.queryParams.type = null;
       this.queryParams.status = null;
-      this.queryParams.range = [];
+      this.queryParams.range =  [new Date(),new Date()];
       this.queryParams.orgId = this.orgId;
       this.selectedOrgName = this.orgName;
       this.queryParams.checkSub = true;

src/views/core/edu/task/index.vue

@@ -348,7 +348,7 @@ export default {
         orgId: this.$store.getters.orgId,
         type: null,
         status: null,
-        range: null,
+        range:  [new Date(),new Date()],
       },
       // 表单参数
       form: {},
@@ -405,7 +405,7 @@ export default {
     clearQueryForm() {
       this.queryParams.title = null;
       this.queryParams.status = null;
-      this.queryParams.range = [];
+      this.queryParams.range =  [new Date(),new Date()];
       this.queryParams.orgId = this.orgId;
       this.selectedOrgName = this.orgName;
       this.queryParams.checkSub = true;

src/views/core/outIn/approve/dialog.approve.letter.detail.vue

@@ -6,114 +6,79 @@
       width="1000px"
     >
       <div class="page-body">
-        <el-form
-          ref="form"
-          :model="formData"
-          label-width="120px"
-          label-suffix=":">             
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="介绍信类型">
-              <dict-tag :options="dict.type.out_in_type" :value="formData.type"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="介绍信编号">
-              {{formData.letterNo}}
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="接待机构" prop="receptionOrgIds">
-                {{formData.receptionOrgNames}}
-                <!-- <org-tree-select v-model="formData.receptionOrgIds" ref="orgTreeSelect">
-                </org-tree-select> -->
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="来访事由">
-              {{formData.reasons}}
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item  label="开具日期">
-              {{formData.startTimeStr}}
-              </el-form-item>
-            </el-col>
-           
-            <el-col :span="12">
-              <el-form-item  label="有效天数">
-                {{ formData.effectiveDays}}
-              </el-form-item>
-            </el-col>
-           
-            <el-col :span="12">
-              <!-- <el-form-item label="介绍信" prop="letterNo">               
-              </el-form-item> -->
-              <el-form-item label="介绍信附件">
-                <K-file-upload ref="upload" :isShowUploadBtn="false"
-                                :defaultValue="formFileListDefualtValue"
-                                v-model="formData.letterFile"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="备注" prop="letterNo">
-                {{formData.description}}
-              </el-form-item>
-            </el-col>          
-          </el-row>
-          <el-row :gutter="10">
-            <el-col :span="12">
-                <h3>
-                  <i class="el-icon-collection-tag"></i>
-                  人员信息
-                </h3> 
-            </el-col>              
-          </el-row>
-          <el-table border :data="formData.userInfos" height="300">
-            <el-table-column label="序号"  align="center"  type="index" width="70" />
-            <el-table-column label="来访单位" width="100" align="center" prop="companyName" />
-            <el-table-column label="来访人员" width="100" align="center" prop="userName" />
-            <el-table-column label="证件类型" width="100" align="center" prop="idType">
-              <template slot-scope="scope">
+        <el-descriptions
+          :column="2"
+          border
+          size="medium"
+          :label-style="labelStyle"
+          :contentStyle="content_style">
+          <el-descriptions-item label="介绍信类型">
+            <dict-tag :options="dict.type.out_in_type" :value="formData.type"/>
+          </el-descriptions-item>
+<!--          <el-descriptions-item label="当前状态">-->
+<!--            <dict-tag :options="dict.type.letter_status" :value="formData.status"/>-->
+<!--          </el-descriptions-item>-->
+          <el-descriptions-item label="介绍信编号">{{formData.letterNo}}</el-descriptions-item>
+          <el-descriptions-item label="接待机构">{{formData.receptionOrgNames}}</el-descriptions-item>
+          <el-descriptions-item label="来访事由">{{formData.reasons}}</el-descriptions-item>
+          <el-descriptions-item label="开具日期">{{formData.startTimeStr}}</el-descriptions-item>
+          <el-descriptions-item label="有效天数">{{formData.effectiveDays}}</el-descriptions-item>
+          <el-descriptions-item label="介绍信附件">
+            <K-file-upload
+              ref="upload"
+              :isShowUploadBtn="false"
+              :defaultValue="formData.letterFile"
+            />
+          </el-descriptions-item>
+          <el-descriptions-item label="备注">{{formData.description}}</el-descriptions-item>
+
+        </el-descriptions >
+
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <h3>
+              <i class="el-icon-collection-tag"></i>
+              人员信息
+            </h3>
+          </el-col>
+        </el-row>
+        <el-table border :data="formData.userInfos" height="300">
+          <el-table-column label="序号"  align="center"  type="index" width="70" />
+          <el-table-column label="来访单位" width="100" align="center" prop="companyName" />
+          <el-table-column label="来访人员" width="100" align="center" prop="userName" />
+          <el-table-column label="证件类型" width="100" align="center" prop="idType">
+            <template slot-scope="scope">
               <dict-tag :options="dict.type.letter_id_type" :value="scope.row.idType"/>
             </template>
-            </el-table-column>
-            <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> 
-              </el-table-column>             
-          </el-table>     
-          <el-row :gutter="10">
-            <el-col :span="12">
-                <h3>
-                  <i class="el-icon-collection-tag"></i>
-                  审批信息
-                </h3> 
-            </el-col>              
-          </el-row>      
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="审批状态">   
-                <dict-tag :options="dict.type.out_in_approve_status" :value="formData.approveLog.approveStatus"/> 
-                <!-- <el-radio v-model="formData.approveStatus" label="1">同意</el-radio>
-                <el-radio v-model="formData.approveStatus" label="2">不同意</el-radio>            -->
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="审批说明"> 
-               {{formData.approveLog.approveRemark}}
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="审批时间"> 
-               {{formData.approveLog.approveTime}}
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+          </el-table-column>
+          <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>
+          </el-table-column>
+        </el-table>
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <h3>
+              <i class="el-icon-collection-tag"></i>
+              审批信息
+            </h3>
+          </el-col>
+        </el-row>
+        <el-descriptions
+          :column="2"
+          border
+          size="medium"
+          :label-style="labelStyle"
+          :contentStyle="content_style">
+          <el-descriptions-item label="审批状态">
+            <dict-tag :options="dict.type.out_in_approve_status" :value="formData.approveLog.approveStatus"/>
+          </el-descriptions-item>
+          <el-descriptions-item label="审批时间"> {{formData.approveLog.approveTime}}</el-descriptions-item>
+          <el-descriptions-item label="审批说明">  {{formData.approveLog.approveRemark}}</el-descriptions-item>
+        </el-descriptions >
       </div>
       <div slot="footer" class="dialog-footer">
         <!-- <el-button type="primary" @click="submitForm">确 定</el-button> -->
@@ -136,10 +101,22 @@ export default {
   data() {
     const params = this.$route.params;
     return {
+      labelStyle: {
+        color: "#000",
+        "text-align": "center",
+        height: "40px",
+        "min-width": "150px",
+        "word-break": "keep-all",
+      },
+      content_style: {
+        "text-align": "left",
+        "min-width": "300px",
+        "word-break": "break-all",
+      },
       id: params ? params.id : null,
       isShow: false,
       title: "来访事项审批详情",
-      formData: this.reset(),      
+      formData: this.reset(),
       formFileListDefualtValue: [],
     };
   },
@@ -169,19 +146,19 @@ export default {
         ...other,
       };
     },
-    async show(id) {     
-        this.title = "来访事项审批详情";   
+    async show(id) {
+        this.title = "来访事项审批详情";
         this.isShow = true;
         getLetter(id).then((response) => {
           this.formData = response.data;
           this.formFileListDefualtValue=this.formData.letterFile;
-        });     
+        });
     },
     onHide() {
       this.isShow = false;
       this.formData = this.reset();
       // this.$refs["upload"].clearFiles();
-    },    
+    },
   },
   mounted() {},
 };

src/views/core/outIn/approve/index.vue

@@ -205,6 +205,7 @@ export default {
       this.$refs["dialogApproveLetter"].show(row.id, {});
     },
     canApprove(row) {
+      console.log(row.status,row.approveStatus,'row')
       //  console.log("canApprove",row.status ==1,row.approveStatus ==0,dayjs(dayjs(row.endTime).add(1, 'day')).isAfter(dayjs(new Date())))
       return row.status == 1 && row.approveStatus == 0
     },

src/views/core/outIn/letter/dialog.letter.detail.vue

@@ -7,108 +7,132 @@
       width="1000px"
     >
       <div class="page-body">
-        <el-form
-          ref="form"
-          :model="formData"
-          label-width="120px"          
-          label-suffix=":"
-        >
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="当前状态">
-                <dict-tag :options="dict.type.letter_status" :value="formData.status"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="介绍信编号" prop="letterNo">
-                {{formData.letterNo}}
-              </el-form-item>
-            </el-col>
-          
+        <el-descriptions
+          :column="2"
+          border
+          size="medium"
+          :label-style="labelStyle"
+          :contentStyle="content_style">
+          <el-descriptions-item label="当前状态">
+            <dict-tag :options="dict.type.letter_status" :value="formData.status"/>
+          </el-descriptions-item>
+          <el-descriptions-item label="介绍信编号">{{formData.letterNo}}</el-descriptions-item>
+          <el-descriptions-item label="接待机构">{{formData.receptionOrgNames}}</el-descriptions-item>
+          <el-descriptions-item label="来访事由">{{formData.reasons}}</el-descriptions-item>
+          <el-descriptions-item label="开具日期">{{formData.startTimeStr}}</el-descriptions-item>
+          <el-descriptions-item label="有效天数">{{formData.effectiveDays}}</el-descriptions-item>
+          <el-descriptions-item label="介绍信附件">
+            <K-file-upload
+              ref="upload"
+              :isShowUploadBtn="false"
+              :defaultValue="formData.letterFile"
+            />
+          </el-descriptions-item>
+          <el-descriptions-item label="备注">{{formData.description}}</el-descriptions-item>
 
-            <el-col :span="12">
-              <el-form-item label="接待机构" prop="receptionOrgIds">
-                <!-- <org-tree-select v-model="formData.receptionOrgIds" ref="orgTreeSelect">
-                </org-tree-select> -->
-                {{formData.receptionOrgNames}}
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item prop="reasons" label="来访事由">
-                {{formData.reasons}}
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item  label="开具日期">
-                {{ formData.startTimeStr}}
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item  label="有效天数">
-                {{ formData.effectiveDays}}
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="介绍信附件">
-                <K-file-upload
-                  ref="upload"
-                  :isShowUploadBtn="false"
-                  :defaultValue="formData.letterFile"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="备注">
-                {{formData.description}}
-              </el-form-item>
-            </el-col>
-           
-          </el-row>
-          <el-row :gutter="10">
-            <el-col :span="12">
-                <h3>
-                  <i class="el-icon-collection-tag"></i>
-                  人员信息
-                </h3> 
-            </el-col>
-          </el-row>
-          <el-table border :data="formData.userInfos" max-height="500" style="margin-bottom: 10px;">
-            <el-table-column label="序号"  align="center"  type="index" width="70" />
-            <el-table-column label="来访单位" width="150" align="center" prop="companyName" />
-            <el-table-column label="来访人员" width="100" align="center" prop="userName" />
-            <el-table-column label="证件类型" width="100" align="center" prop="idType">
-              <template slot-scope="scope">
+        </el-descriptions >
+<!--        <el-form-->
+<!--          ref="form"-->
+<!--          :model="formData"-->
+<!--          label-width="120px"-->
+<!--          label-suffix=":"-->
+<!--        >-->
+<!--          <el-row>-->
+<!--            <el-col :span="24">-->
+<!--              <el-form-item label="当前状态">-->
+<!--                <dict-tag :options="dict.type.letter_status" :value="formData.status"/>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="12">-->
+<!--              <el-form-item label="介绍信编号" prop="letterNo">-->
+<!--                {{formData.letterNo}}-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+
+
+<!--            <el-col :span="12">-->
+<!--              <el-form-item label="接待机构" prop="receptionOrgIds">-->
+<!--                &lt;!&ndash; <org-tree-select v-model="formData.receptionOrgIds" ref="orgTreeSelect">-->
+<!--                </org-tree-select> &ndash;&gt;-->
+<!--                {{formData.receptionOrgNames}}-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="24">-->
+<!--              <el-form-item prop="reasons" label="来访事由">-->
+<!--                {{formData.reasons}}-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="12">-->
+<!--              <el-form-item  label="开具日期">-->
+<!--                {{ formData.startTimeStr}}-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="12">-->
+<!--              <el-form-item  label="有效天数">-->
+<!--                {{ formData.effectiveDays}}-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="12">-->
+<!--              <el-form-item label="介绍信附件">-->
+<!--                <K-file-upload-->
+<!--                  ref="upload"-->
+<!--                  :isShowUploadBtn="false"-->
+<!--                  :defaultValue="formData.letterFile"-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="12">-->
+<!--              <el-form-item label="备注">-->
+<!--                {{formData.description}}-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+
+<!--          </el-row>-->
+<!--        </el-form>-->
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <h3>
+              <i class="el-icon-collection-tag"></i>
+              人员信息
+            </h3>
+          </el-col>
+        </el-row>
+        <el-table border :data="formData.userInfos" max-height="500" style="margin-bottom: 10px;">
+          <el-table-column label="序号"  align="center"  type="index" width="70" />
+          <el-table-column label="来访单位" width="150" align="center" prop="companyName" />
+          <el-table-column label="来访人员" width="100" align="center" prop="userName" />
+          <el-table-column label="证件类型" width="100" align="center" prop="idType">
+            <template slot-scope="scope">
               <dict-tag :options="dict.type.letter_id_type" :value="scope.row.idType"/>
             </template>
-            </el-table-column>
-            <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> 
-               </el-table-column>            
-          </el-table>
-          <el-row :gutter="10">
-            <el-col :span="12">
-                <h3 >
-                  <i class="el-icon-collection-tag"></i>
-                  审批详情
-                </h3> 
-            </el-col>
-          </el-row>
-          <el-table border :data="formData.approveInfos" max-height="500" style="margin-bottom: 10px;">
-                  <el-table-column label="机构名称" header-align="center" align="left" prop="orgName" />
-                  <el-table-column label="审批状态" align="center" prop="approveStatus" >
-                    <template slot-scope="scope">
-                      <dict-tag :options="dict.type.out_in_approve_status" :value="scope.row.approveStatus"/>
-                    </template>                    
-                  </el-table-column>
-                  <el-table-column label="审批说明" header-align="center" align="center" prop="approveRemark">
-                  </el-table-column>
-                </el-table>
-          
-        </el-form>
+          </el-table-column>
+          <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>
+          </el-table-column>
+        </el-table>
+
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <h3 >
+              <i class="el-icon-collection-tag"></i>
+              审批详情
+            </h3>
+          </el-col>
+        </el-row>
+        <el-table border :data="formData.approveInfos" max-height="500" style="margin-bottom: 10px;">
+          <el-table-column label="机构名称" header-align="center" align="left" prop="orgName" />
+          <el-table-column label="审批状态" align="center" prop="approveStatus" >
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.out_in_approve_status" :value="scope.row.approveStatus"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="审批说明" header-align="center" align="center" prop="approveRemark">
+          </el-table-column>
+        </el-table>
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="onHide">关 闭</el-button>
@@ -135,6 +159,18 @@ export default {
   data() {
     const params = this.$route.params;
     return {
+      labelStyle: {
+        color: "#000",
+        "text-align": "center",
+        height: "40px",
+        "min-width": "150px",
+        "word-break": "keep-all",
+      },
+      content_style: {
+        "text-align": "left",
+        "min-width": "300px",
+        "word-break": "break-all",
+      },
       id: params ? params.id : null,
       isShow: false,
       title: "录入介绍信",
@@ -176,15 +212,15 @@ export default {
       };
     },
 
-    async show(id) {   
-        this.title = "介绍信详情";   
+    async show(id) {
+        this.title = "介绍信详情";
         this.isShow = true;
         getLetter(id).then((response) => {
           let tempRange=[];
           tempRange.push(dayjs(response.data.startTime));
           tempRange.push(new Date(response.data.endTime));
           response.data.range=tempRange;
-          this.formData = response.data;          
+          this.formData = response.data;
         });
     },
     onHide() {

src/views/core/outIn/outInLog/dialog.outIn.detail.vue

@@ -61,106 +61,12 @@
               :defaultValue="formData.letterFile"
             />
           </el-descriptions-item>
-          <el-descriptions-item label="核验结果">{{
-            formData.checkImage
-          }}</el-descriptions-item>
+          <el-descriptions-item label="核验结果">
+            <ImageListPreview v-model="formData.checkImage"></ImageListPreview>
+          </el-descriptions-item>
         </el-descriptions>
-        <!-- <el-form
-          ref="form"
-          :model="formData"
-          :rules="formDataRules"
-          label-width="120px"
-          label-suffix=":"
-        >
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="介绍信类型">
-              <dict-tag :options="dict.type.out_in_type" :value="formData.type"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="介绍信编号">
-              {{formData.letterNo}}
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item  label="接待机构">
-              {{formData.orgName}}
-              </el-form-item>
-            </el-col>
-            
-            <el-col :span="24">
-              <el-form-item label="来访事由">
-              {{formData.reasons}}
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item  label="开具日期">
-                {{ formData.startTime}}
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item  label="有效天数">
-                {{ formData.effectiveDays}}
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="来访单位">
-             {{formData.companyName}}
-              </el-form-item>
-            </el-col> 
-           
-            <el-col :span="12">
-              <el-form-item label="来访人员">
-             {{formData.userName}}
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="证件类型">              
-              <dict-tag :options="dict.type.letter_id_type" :value="formData.idType"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="证件号码">
-             {{formData.idCard}}
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="进入时间">
-                {{ formData.arrivalTime}}
-              </el-form-item>
-            </el-col>  
-            <el-col :span="12">
-              <el-form-item label="离开时间">
-                {{formData.departureTime}}
-              </el-form-item>
-            </el-col>  
-          
-            <el-col :span="12">
-              <el-form-item label="介绍信附件">
-                <K-file-upload ref="upload" :isShowUploadBtn="false"
-                                :defaultValue="formData.letterFile"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="核验结果">
-                <template>
-                  <ImageListPreview v-model="formData.checkImage"></ImageListPreview>
-                </template> 
-              </el-form-item>
-            </el-col>
-          
-        
-           
-            
-           
-            
-           
-          </el-row>
-        </el-form> -->
       </div>
       <div slot="footer" class="dialog-footer">
-        <!-- <el-button type="primary" @click="submitForm">确 定</el-button> -->
         <el-button @click="onHide">关 闭</el-button>
       </div>
     </DialogCom>
@@ -200,7 +106,7 @@ export default {
       formFileListDefualtValue: [],
     };
   },
-  dicts: ["out_in_type", "letter_id_type"],
+  dicts: ["out_in_type", "letter_id_type",],
   props: {},
   watch: {},
   created() {},

src/views/core/outIn/outInLog/index.vue

@@ -252,6 +252,7 @@ import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
 import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
 import dialogOutInDetail from "./dialog.outIn.detail.vue";
 import {mapGetters} from "vuex";
+import {imageUrl} from "@/utils/ruoyi";
 
 export default {
   components: {OrgTree, KFileUpload, DataRangePicker, dialogOutInDetail},
@@ -326,7 +327,7 @@ export default {
       this.queryParams.orgId = this.orgId;
       this.queryParams.checkSub = true;
       this.$refs["orgTree"].setCheckSub(this.queryParams.checkSub)
-      this.queryParams.range = [];
+      this.queryParams.range = ['',''];
       this.handleQuery();
     },
     getDefaultKey(key) {
@@ -349,7 +350,7 @@ export default {
     },
     async onDown(pdfUrl) {
       // const data = await this.$api.eduTraining.predown(id);
-      window.open(pdfUrl);
+      window.open(imageUrl(pdfUrl));
     },
   },
 };

src/views/core/task/dialog.info.vue

@@ -87,7 +87,7 @@
                 formData.retrievalUserName
               }}</el-form-item>
             </el-col>
-           
+
             <el-col :span="12">
               <el-form-item prop="trainingEndDateTime" label="调阅开始时间">{{
                 formData.startTime
@@ -101,7 +101,7 @@
           </el-row> -->
           <div class="extend_mod">
 
-          
+
           <el-table
             v-loading="loading"
             :data="formData.taskDataVoList"

src/views/core/task/index.vue

@@ -262,6 +262,7 @@ export default {
         taskName: null,
         cycle: null,
         dateRange: [],
+        planStartTime:null,
         status: null,
         roleId: null,
         checkSub: true,
@@ -379,8 +380,9 @@ export default {
       this.queryParams.orgId = this.orgId;
       this.selectedOrgName = this.orgName;
       this.queryParams.checkSub = true;
-      this.$refs["orgTree"].setCheckSub(this.queryParams.checkSub)
-      this.queryParams.dateRange = [];
+      this.queryParams.dateRange = ['',''];
+      this.queryParams.planStartTime=null;
+      this.$refs["orgTree"].setCheckSub(this.queryParams.checkSub);
       this.handleQuery();
     },
     // 多选框选中数据

src/views/resumptionEvaluate/evaluate/index.vue

@@ -176,6 +176,7 @@
                 <el-button
                   size="mini"
                   @click="publishHandler(row)"
+                  v-hasPermi="['core:evaluatePlan:distribute']"
                   type="text"
                   v-if="row.orgId == isEdit && row.status == 0"
                   :class="

src/views/safetyBook/newBook/dialog.des.vue

@@ -48,7 +48,7 @@
                 v-model="formData.orgName"
                 :disabled="true"
               ></el-input>
-               
+
               </el-form-item> -->
             <el-descriptions-item labelClassName="gx_info_label" label="甲方姓名">
               {{ formData.partyA }}
@@ -128,7 +128,7 @@
                   :preview-src-list="[file.url]"
                   fit="contain"
                 ></el-image>
-                <div v-else="isPic(file.url)">
+                <div v-else>
                   <el-link :href="file.url" :underline="false" target="_blank">
                     <span class="el-icon-document"> {{ file.name }} </span>
                   </el-link>
@@ -292,14 +292,14 @@ export default {
   }
 }
 .container {
-  width: 50px;
   height: 50px;
-  float: left;
+  display: flex;
+  justify-content: flex-start;
   .item {
-    width: 100%;
+    width: 50px;
     height: 100%;
   }
-  .item img {
+  .item >img {
     width: 100% !important;
     object-fit: cover !important;
   }

src/views/safetycheck/task/index.vue

@@ -420,6 +420,7 @@ import { checkPermi } from "@/utils/permission.js";
 import dayjs from "dayjs";
 import { deptTreeSelect } from "@/api/system/public";
 import request from "@/utils/request";
+import {newline} from "js-beautify/js/src/javascript/acorn";
 export default {
   name: "Saftask",
   dicts: ["resumption_plan_cycle", "resumption_status", "safety_check_status"],
@@ -453,7 +454,7 @@ export default {
         planStartTime: null,
         title: null,
         checkOrgIds: null,
-        range: [],
+        range: [new Date(),new Date()],
       },
       selectedOrgName: null,
       pageData: [],
@@ -594,14 +595,14 @@ export default {
       this.getList();
     },
     resetQuery() {
-      this.queryParams.checkOrgIds = null;
-      this.queryParams.range = [];
       this.resetForm("queryParams");
+      this.queryParams.checkOrgIds = null;
       this.queryParams.orgId = this.orgId;
       this.selectedOrgName = this.orgName;
       this.queryParams.checkSub = true;
-      this.$refs["orgTree"].setCheckSub(this.queryParams.checkSub)
-      this.getList();
+      this.$refs["orgTree"].setCheckSub(this.queryParams.checkSub);
+      this.queryParams.range = [new Date(),new Date()];
+
     },
     handleAdd() {
       let path = "/safetycheck/tempregister/add";

src/views/system/dept/extend.vue

@@ -252,8 +252,8 @@
                   :value="dict.value"
                 ></el-option>
               </el-select>
-            </el-descriptions-item>
-
+            </el-descriptions-item> 
+    
             <el-descriptions-item v-if="type === org_type.yewd" labelClassName="gx_info_label" label="是否配备保安人员">
               <el-radio-group v-model="askari">
                 <el-radio :label="1">是</el-radio>
@@ -509,6 +509,7 @@
 
   export default {
     dicts: [
+    "duty_options",
       "sys_org_type",
       "org_platform_brand",
       "org_platform_supplier_brand",
@@ -521,7 +522,6 @@
       "org_extend_detached_standard",
       "org_extend_is",
       "property_situation",
-      "duty_options",
     ],
     props: [],
     components: {

src/views/system/dept/index.vue

@@ -502,7 +502,7 @@ export default {
           { required: true, message: "机构名称不能为空", trigger: "blur" },
         ],
         type: [
-          { required: true, message: "机构类型不能为空", trigger: "blur" },
+          { required: true, message: "机构类型不能为空", trigger: "change" },
         ],
         orderNum: [
           { required: true, message: "显示排序不能为空", trigger: "blur" },

src/views/system/workTimeSet/workTimeWeek.vue

@@ -38,9 +38,10 @@
               <el-form-item label="生效日期">
                 <DataRangePicker
                   style="width: 240px"
-                  v-model="dateRange"
+                  v-model="queryParams.dateRange"
                   key="daterange"
                   type="daterange"
+                  :editable="false"
                   :clearable="false"
                   range-separator="-"
                   start-placeholder="开始日期"
@@ -153,8 +154,8 @@ export default {
         orgId: null,
         isEnable:false,
         orgType:null,
+        dateRange:[],
       },
-      dateRange:[],
       total:0,
       // 列信息
       columns: [
@@ -218,7 +219,7 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      weekTableList(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      weekTableList(this.queryParams).then(response => {
           this.tableList = response.data.records;
           this.total = response.data.total;
           this.loading = false;
@@ -262,7 +263,7 @@ export default {
       this.queryParams.isEnable = false;
       this.queryParams.pageNum= 1;
       this.queryParams.pageSize=10;
-      this.dateRange = [];
+      this.queryParams.dateRange = ['',''];
       this.queryParams.orgId=this.orgId;
       this.queryParams.orgType = null;
       this.queryParams.checkSub = true;