Merge remote-tracking branch 'origin/master'

src/views/specialApply/modules/TaskCheckList.vue

@@ -149,7 +149,7 @@
                 <a-icon type="down"/>
               </a>
               <a-menu slot="overlay">
-                <a-menu-item v-has="'task:check:list:delete'">
+                <a-menu-item v-has="'special:task:check:list:delete'" v-if="record.checkState == 0 || record.checkState == 1">
                   <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                     <a>删除</a>
                   </a-popconfirm>

src/views/warningList/ShortCheck.vue

@@ -218,7 +218,7 @@
             <a-list-item style='height: 60px' >
               <a-col :span="6" >
                 <div>
-                  <div style="float:left;margin: 50px 3px;" id="directRequirements">稽核是否通过</div>
+                  <div style="float:left;margin: 50px 3px;" id="directRequirements">稽核是否通过：</div>
                   <div style="float:left;margin: 50px 10px;" >
                     <a-radio-group  button-style="solid"  @change="basicCheckClick(shotInfoModel.contractDateResult)" v-model='shotInfoModel.contractDateResult'>
                       <a-radio :value="'1'">是</a-radio>
@@ -233,10 +233,9 @@
       </div>
       <!--      附件-->
       <div>
-        <a-form-model-item style="left: 10%;width: 70%;" label="稽核结果备注：" v-bind="labelCol1Note">
-          <a-textarea style="height: 50px"
+        <a-form-model-item style="left: 5%;width: 100%;" label="稽核结果备注：" v-bind="labelCol1Note">
+          <a-textarea style="height: 77px"
                       v-model="shotInfoModel.contractDateResultRemark"
-
                       placeholder="请输入稽核结果"
           />
         </a-form-model-item>
@@ -245,7 +244,7 @@
           <!--            :auto-size="{ minRows: 3, maxRows: 5 }"-->
         </a-form-model-item>
       </div>
-      <div style="height: 70%">
+      <div style="height: 70%;position: relative;left: 10%">
         <div class="thumb-example" >
           <!-- swiper1 -->
           <swiper
@@ -344,8 +343,8 @@
       </div>
       <!--      附件-->
       <div>
-        <a-form-model-item style="left: 10%;width: 70%;" label="稽核结果备注：" v-bind="labelCol1Note">
-          <a-textarea style="height: 50px"
+        <a-form-model-item style="left: 10%;width: 100%;" label="稽核结果备注：" v-bind="labelCol1Note">
+          <a-textarea style="height: 77px"
                       v-model="shotInfoModel.codeNumberDateResultRemark"
 
                       placeholder="请输入稽核结果"
@@ -357,7 +356,7 @@
         </a-form-model-item>
       </div>
       <!--      文件上传-->
-      <div style="height: 70%">
+      <div style="height: 70%;position: relative;left: 10%">
         <div class="thumb-example"  >
           <!-- swiper1 -->
           <swiper
@@ -453,8 +452,8 @@
       </div>
       <!--      附件-->
       <div>
-        <a-form-model-item style="left: 10%;width: 70%;" label="稽核结果备注：" v-bind="labelCol1Note">
-          <a-textarea style="height: 50px"
+        <a-form-model-item style="left: 5%;width: 100%;" label="稽核结果备注：" v-bind="labelCol1Note">
+          <a-textarea style="height: 77px"
                       v-model="shotInfoModel.filingsDateResultRemark"
 
                       placeholder="请输入稽核结果"
@@ -466,7 +465,7 @@
         </a-form-model-item>
       </div>
       <!--      文件上传-->
-      <div style="height: 70%">
+      <div style="height: 70%;position: relative;left: 10%">
         <div class="thumb-example"  >
           <!-- swiper1 -->
           <swiper
@@ -564,8 +563,8 @@
       </div>
       <!--      附件-->
       <div>
-        <a-form-model-item style="left: 10%;width: 70%;" label="稽核结果备注：" v-bind="labelCol1Note">
-          <a-textarea style="height: 50px"
+        <a-form-model-item style="left: 5%;width: 100%;" label="稽核结果备注：" v-bind="labelCol1Note">
+          <a-textarea style="height: 77px"
                       v-model="shotInfoModel.permitDateResultRemark"
 
                       placeholder="请输入稽核结果"
@@ -576,7 +575,7 @@
           <!--            :auto-size="{ minRows: 3, maxRows: 5 }"-->
         </a-form-model-item>
       </div>
-      <div style="height: 70%">
+      <div style="height: 70%;position: relative;left: 10%">
         <div class="thumb-example"  >
           <!-- swiper1 -->
           <swiper
@@ -1124,10 +1123,10 @@ export default {
     },
     /*提交*/
     submitAuditLot() {
-      if (this.infoDataStatus=='5'){
+      /*if (this.infoDataStatus=='5'){
         this.$message.warn( "该数据稽核未达终态...");
         return
-      }
+      }*/
       this.uploading=true;
       var info = "yes";
       if (this.shotInfoModel.warningInfo==="" || this.shotInfoModel.warningInfo===undefined || this.shotInfoModel.warningInfo===null){

src/views/warningList/ShortCheckZG.vue

@@ -298,7 +298,7 @@
       </a-form-model-item>
       <!--      文件上传-->
       <!--      附件-->
-      <div style="height: 70%">
+      <div style="height: 70%;position: relative;left: 10%">
         <a-upload
           name="file"
           :multiple="true"
@@ -436,7 +436,7 @@
       </a-form-model-item>
       <!--      附件-->
 
-      <div style="height: 70%">
+      <div style="height: 70%;position: relative;left: 10%">
         <a-upload
           name="file"
           :multiple="true"
@@ -571,7 +571,7 @@
         />
         <!--            :auto-size="{ minRows: 3, maxRows: 5 }"-->
       </a-form-model-item>
-      <div style="height: 70%">
+      <div style="height: 70%;position: relative;left: 10%">
         <a-upload
           name="file"
           :multiple="true"
@@ -706,7 +706,7 @@
         <!--            :auto-size="{ minRows: 3, maxRows: 5 }"-->
       </a-form-model-item>
 
-      <div style="height: 70%">
+      <div style="height: 70%;position: relative;left: 10%">
         <a-upload
           name="file"
           :multiple="true"

src/views/warningList/ShortRowShow.vue

@@ -126,8 +126,8 @@
         </a-col>
       </a-row>
     </a-page-header>
-    <a-card  style="margin-bottom:10px;">
 
+    <a-card  style="margin-bottom:10px;">
       <a-descriptions title="预警字段重新填写" :column="3" :bordered="false">
       </a-descriptions>
       <a-form-model
@@ -227,7 +227,7 @@
       <!--      附件-->
 
       <div>
-        <a-form-model-item style="left: 5%;width: 85%;" label="上传资料备注：" v-bind="labelCol1Note">
+        <a-form-model-item style="left: 5%;width: 100%;" label="上传资料备注：" v-bind="labelCol1Note">
           <a-textarea style="height: 77px"
                       v-model="shotInfoModel.contractDateRemark"
                       @change="textareaChange('contractDate','contractDateRemark')"
@@ -236,7 +236,7 @@
           <!--            :auto-size="{ minRows: 3, maxRows: 5 }"-->
         </a-form-model-item>
       </div>
-      <div style="height: 70%">
+      <div style="height: 70%;position: relative;left: 10%">
         <a-upload
           name="file"
           :multiple="true"
@@ -356,7 +356,7 @@
       <!--      文件上传-->
       <!--      附件-->
       <div>
-        <a-form-model-item style="left: 5%;width: 85%;" label="上传资料备注：" v-bind="labelCol1Note">
+        <a-form-model-item style="left: 5%;width: 100%;" label="上传资料备注：" v-bind="labelCol1Note">
 
           <a-textarea style="height: 77px"
                       @change="textareaChange('codeNumberDate','codeNumberDateRemark')"
@@ -366,7 +366,7 @@
           <!--            :auto-size="{ minRows: 3, maxRows: 5 }"-->
         </a-form-model-item>
       </div>
-      <div style="height: 70%">
+      <div style="height: 70%;position: relative;left: 10%">
         <a-upload
           name="file"
           :multiple="true"
@@ -483,7 +483,7 @@
       <!--      文件上传-->
       <!--      附件-->
       <div>
-        <a-form-model-item style="left: 5%;width: 85%;" label="上传资料备注：" v-bind="labelCol1Note">
+        <a-form-model-item style="left: 5%;width: 100%;" label="上传资料备注：" v-bind="labelCol1Note">
 
           <a-textarea style="height: 77px"
                       @change="textareaChange('filingsDate','filingsDateRemark')"
@@ -493,7 +493,7 @@
           <!--            :auto-size="{ minRows: 3, maxRows: 5 }"-->
         </a-form-model-item>
       </div>
-      <div style="height: 70%">
+      <div style="height: 70%;position: relative;left: 10%">
         <a-upload
           name="file"
           :multiple="true"
@@ -611,7 +611,7 @@
       <!--      文件上传-->
       <!--      附件-->
       <div>
-        <a-form-model-item style="left: 5%;width: 85%;" label="上传资料备注：" v-bind="labelCol1Note">
+        <a-form-model-item style="left: 5%;width: 100%;" label="上传资料备注：" v-bind="labelCol1Note">
 
           <a-textarea style="height: 77px"
                       @change="textareaChange('permitDate','permitDateRemark')"
@@ -621,7 +621,7 @@
           <!--            :auto-size="{ minRows: 3, maxRows: 5 }"-->
         </a-form-model-item>
       </div>
-      <div style="height: 70%">
+      <div style="height: 70%;position: relative;left: 10%">
         <a-upload
           name="file"
           :multiple="true"

src/views/warningList/TaskCheckList.vue

@@ -316,14 +316,6 @@ export default {
           sorter: true,
           dataIndex: 'staffNo'
         },
-        {
-          //0：未处理；1：未完善；2：待稽核；4：待整改；5：稽核通过；）
-          title:'预警稽核进度',
-          align:"center",
-          sorter: true,
-          dataIndex: 'warningState',
-          scopedSlots: { customRender: 'checkState' }
-        },
         {
           title: '员工二级部门',
           align: "center",
@@ -334,6 +326,19 @@ export default {
           align: "center",
           dataIndex: 'staffDeptLevel3Name'
         },
+        {
+          title: '创建时间',
+          align: "center",
+          dataIndex: 'createTime'
+        },
+        {
+          //0：未处理；1：未完善；2：待稽核；4：待整改；5：稽核通过；）
+          title:'预警稽核进度',
+          align:"center",
+          sorter: true,
+          dataIndex: 'warningState',
+          scopedSlots: { customRender: 'checkState' }
+        },
         {
           title: '操作',
           dataIndex: 'action',