Merge remote-tracking branch 'origin/master'

src/views/modules/cw/projectReportArchive/ProjectReportArchiveList.vue

@@ -74,6 +74,21 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="归档状态" prop="archiveSta">
+        <el-select v-model="searchForm.archiveSta" placeholder="请选择归档状态" clearable style="width: 100%">
+          <el-option-group
+            v-for="(type,index) in typeDictList"
+            :key="type.key"
+            :label="type.label">
+            <el-option
+              v-for="item in typeDictList[index].childrenList"
+              :key="item.key"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-option-group>
+        </el-select>
+      </el-form-item>
 
       <el-form-item>
         <el-button type="primary" @click="refreshList()" size="small" icon="el-icon-search">查询</el-button>
@@ -133,7 +148,23 @@
           <vxe-column min-width="150" align="center" title="底稿册数" field="papersNum"></vxe-column>
           <vxe-column min-width="150" align="center" title="档案年度" field="year"></vxe-column>
           <vxe-column min-width="230" align="center" title="案卷号" field="number"></vxe-column>
-          <vxe-column min-width="200" align="center" title="归档时间" field="auditDate"></vxe-column>
+          <vxe-column min-width="150" align="center" title="报告日期" :formatter="formatDate" field="reportDate"></vxe-column>
+          <vxe-column min-width="200" align="center" title="归档时间" :formatter="formatDate" field="auditDate"></vxe-column>
+          <vxe-column min-width="150" align="center" title="归档状态" field="archiveSta">
+            <template slot-scope="scope">
+              <span style="color:#5bc0de; font-weight: bold;" v-if="scope.row.archiveSta === '暂时未归档'">暂时未归档</span>
+              <span style="color:#de6764; font-weight: bold;" v-if="scope.row.archiveSta === '超期未归档'">超期未归档</span>
+              <span style="color:#5cb85c; font-weight: bold;" v-if="scope.row.archiveSta === '已按时归档'">已按时归档</span>
+              <span style="color:#f0ad4e; font-weight: bold;" v-if="scope.row.archiveSta === '已超期归档'">已超期归档</span>
+            </template>
+          </vxe-column>
+          <vxe-column min-width="150" align="center" title="超期（天）" field="overdueDay">
+            <template slot-scope="scope">
+              <span style="color:#5bc0de; font-weight: bold;" v-if="scope.row.archiveSta === '暂时未归档'">{{scope.row.overdueDay}}</span>
+              <span style="color:#de6764; font-weight: bold;" v-if="scope.row.archiveSta === '超期未归档'">{{scope.row.overdueDay}}</span>
+              <span style="color:#5cb85c; font-weight: bold;" v-if="scope.row.archiveSta === '已按时归档'">{{scope.row.overdueDay}}</span>
+              <span style="color:#f0ad4e; font-weight: bold;" v-if="scope.row.archiveSta === '已超期归档'">{{scope.row.overdueDay}}</span>
+            </template></vxe-column>
           <vxe-column min-width="150" align="center" title="创建人" field="createBy.name"></vxe-column>
           <vxe-column min-width="200" align="center" title="创建时间" field="createDate"></vxe-column>
           <vxe-column  min-width="110px"align="center" fixed="right" title="状态" field="status" >
@@ -181,6 +212,7 @@
   import ProjectReportArchiveForm from './ProjectReportArchiveForm'
   import UserSelect from '@/components/userSelect'
   import ProjectRecordsService from '@/api/cw/projectRecords/ProjectRecordsService'
+  import XEUtils from 'xe-utils'
   export default {
     data () {
       return {
@@ -199,7 +231,8 @@
           },
           createDates: [],
           reportNo: '',
-          fileNumber: ''
+          fileNumber: '',
+          archiveSta: ''
         },
         dataList: [],
         tablePage: {
@@ -213,7 +246,40 @@
         processDefinitionAuditId: '',
         procDefAuditKey: '',
         isAdmin: false,
-        haveProjectIds: ''
+        haveProjectIds: '',
+        typeDictList: [
+          {
+            key: '已归档',
+            label: '已归档',
+            childrenList: [
+              {
+                key: '已按时归档',
+                value: '已按时归档',
+                label: '已按时归档'
+              },
+              {
+                key: '已超期归档',
+                value: '已超期归档',
+                label: '已超期归档'
+              }
+            ]
+          }, {
+            key: '未归档',
+            label: '未归档',
+            childrenList: [
+              {
+                key: '暂时未归档',
+                value: '暂时未归档',
+                label: '暂时未归档'
+              },
+              {
+                key: '超期未归档',
+                value: '超期未归档',
+                label: '超期未归档'
+              }
+            ]
+          }
+        ]
       }
     },
     projectReportArchiveService: null,
@@ -249,6 +315,9 @@
       this.refreshList()
     },
     methods: {
+      formatDate ({ cellValue }) {
+        return XEUtils.toDateString(cellValue, 'yyyy-MM-dd')
+      },
       // 新增
       add () {
         // this.$refs.projectRecordsForm.init('add', '')

src/views/modules/cw/reportManagement/ReportManagementSignatureForm.vue

@@ -318,7 +318,7 @@
             <el-form-item label="公司注册地址" prop="registerAddress"
                           :rules="[
                    ]">
-              <el-input :disabled="true" v-model="inputForm.registerAddress" placeholder="请填写公司注册地址" clearable>
+              <el-input v-model="inputForm.registerAddress" placeholder="请填写公司注册地址" clearable>
               </el-input>
             </el-form-item>
           </el-col>
@@ -326,7 +326,7 @@
             <el-form-item label="业务所在地" prop="businessLocation"
                           :rules="[
                    ]">
-              <el-input :disabled="true" v-model="inputForm.businessLocation" placeholder="请填写业务所在地" clearable>
+              <el-input v-model="inputForm.businessLocation" placeholder="请填写业务所在地" clearable>
               </el-input>
             </el-form-item>
           </el-col>
@@ -334,7 +334,7 @@
             <el-form-item label="是否数据证券业务" prop="securityBusiness"
                           :rules="[
                    ]">
-              <el-select :disabled="true" v-model="inputForm.securityBusiness" placeholder="请选择是否数据证券业务" style="width:100%;">
+              <el-select v-model="inputForm.securityBusiness" placeholder="请选择是否数据证券业务" style="width:100%;">
                 <el-option
                   v-for="item in $dictUtils.getDictList('cw_report_negotiable')"
                   :key="item.value"