前端：有效日期恢复使用ApplyTime字段，不使用EffectEndTime；目录管理添加责任部室和申报单位两列。

src/dashoo.cn/frontend_web/src/pages/oilsupplier/oilcatalog/income.vue

@@ -11,14 +11,14 @@
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="时间">
-            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
+            <el-date-picker size="mini" style="width: 220px" clearable v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="有效期" end-placeholder="有效期"></el-date-picker>
           </el-form-item>
           <el-form-item label="企业名称">
-            <el-input size="mini" v-model="searchForm.CompanyName" style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" clearable v-model="searchForm.CompanyName" style="width:100%" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="业务范围">
-            <el-input size="mini" v-model="searchForm.Business" style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" clearable v-model="searchForm.Business" style="width:100%" placeholder="请输入"></el-input>
           </el-form-item>
           <!--<el-form-item label="准入类型">-->
             <!--<el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeName" placeholder="准入类别">-->
@@ -62,14 +62,16 @@
           </template>
 
         </el-table-column>
+        <el-table-column type="index" width="50" align="center" />
         <!--<el-table-column sortable min-width="80" align="center" show-overflow-tooltip prop="SupplierName" label="序号"></el-table-column>-->
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="CompanyName" label="企业名称"></el-table-column>
+        <el-table-column sortable min-width="220" align="center" show-overflow-tooltip prop="CompanyName" label="企业名称"></el-table-column>
         <el-table-column sortable width="100" align="center" show-overflow-tooltip prop="LegalPerson" label="法人姓名"></el-table-column>
         <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="IDCode" label="法人身份证号"></el-table-column>
         <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Address" label="企业注册地址"></el-table-column>
         <el-table-column sortable min-width="150" align="center" show-overflow-tooltip prop="USCCode" label="全国统一信用代码"></el-table-column>
         <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="RegCapital" label="注册资本"></el-table-column>
         <el-table-column sortable min-width="300" align="center" show-overflow-tooltip prop="RecordScope" label="申请备案范围"></el-table-column>
+        <el-table-column sortable width="120" align="center" :key="Math.random()" v-if="formData.CatalogType == 6 || formData.CatalogType == 7" show-overflow-tooltip prop="Dept" label="申报单位"></el-table-column>
         <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Remark" label="备注"></el-table-column>
 
       </el-table>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/oilcatalog/index.vue

@@ -11,14 +11,14 @@
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="时间">
-            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
+            <el-date-picker size="mini" clearable style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="有效期" end-placeholder="有效期"></el-date-picker>
           </el-form-item>
           <el-form-item label="企业名称">
-            <el-input size="mini" v-model="searchForm.CompanyName" style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" clearable v-model="searchForm.CompanyName" style="width:100%" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="业务范围">
-            <el-input size="mini" v-model="searchForm.Business" style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" clearable v-model="searchForm.Business" style="width:100%" placeholder="请输入"></el-input>
           </el-form-item>
           <!--<el-form-item label="准入类型">-->
             <!--<el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeName" placeholder="准入类别">-->
@@ -68,6 +68,7 @@
           </template>
 
         </el-table-column>
+        <el-table-column type="index" width="50" align="center" />
         <!--<el-table-column sortable min-width="80" align="center" show-overflow-tooltip prop="SupplierName" label="序号"></el-table-column>-->
         <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="CompanyName" label="企业名称"></el-table-column>
         <el-table-column sortable width="400" align="center" show-overflow-tooltip prop="Business" label="业务范围"></el-table-column>
@@ -76,6 +77,7 @@
             {{(jstimehandle(scope.row.ValidityFrom))}}--{{(jstimehandle(scope.row.ValidityTo))}}
           </template>
         </el-table-column>
+        <el-table-column sortable width="120" align="center" :key="Math.random()" v-if="formData.CatalogType == 4 || formData.CatalogType == 5" show-overflow-tooltip prop="DutyDept" label="责任部室"></el-table-column>
         <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Remark" label="备注"></el-table-column>
 
       </el-table>
@@ -86,7 +88,7 @@
     <el-dialog :title="addShowTitle"
                :visible.sync="addshow"
                width="60%">
-      <el-form label-width="135px" ref="EntityForm" :model="formData">
+      <el-form label-width="95px" ref="EntityForm" :model="formData">
         <el-row>
           <el-col :span="12">
             <el-form-item label="供方名称" prop="CompanyName" :rules="{ required: true, message: '供方名称不能为空', trigger: 'blur'}">
@@ -95,7 +97,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="有效期" prop="ValidityDate" >
-              <el-date-picker style="width: 220px" v-model="ValidityDate" type="daterange" range-separator="至"
+              <el-date-picker style="width: 100%" v-model="ValidityDate" type="daterange" range-separator="至"
                               start-placeholder="有效期起" end-placeholder="有效期止" :readonly="!showBtn"></el-date-picker>
             </el-form-item>
           </el-col>
@@ -104,6 +106,16 @@
               <el-input v-model="formData.Business"  type="textarea" style="width: 100%" :readonly="!showBtn"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="24" v-if="formData.CatalogType == 4 || formData.CatalogType == 5">
+            <el-form-item label="责任部室" prop="DutyDept">
+              <el-input v-model="formData.DutyDept"  :maxlength="100" style="width: 100%" :readonly="!showBtn"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-if="formData.CatalogType == 6 || formData.CatalogType == 7">
+            <el-form-item label="申报单位" prop="Dept">
+              <el-input v-model="formData.Dept"  :maxlength="100" style="width: 100%" :readonly="!showBtn"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="备注">
               <el-input v-model="formData.Remark"  placeholder="请输入" type="textarea" style="width: 100%" :readonly="!showBtn">
@@ -112,7 +124,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item style="text-align: center;" v-if="showBtn">
-              <el-button type="primary" size="mini" @click="saveOilcatalog">保存</el-button>
+              <el-button type="primary" size="small" @click="saveOilcatalog">保存</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -211,6 +223,8 @@
           OrderNo: '',
           CompanyName: '',
           Business: '',
+          DutyDept: '', // 责任部室
+          Dept: '', // 申报单位
           ValidityFrom: null,
           ValidityTo: null,
           Remark: ''
@@ -219,6 +233,7 @@
     },
     watch: {
       $route (val) {
+        console.log('值啥啥啥', val)
         this.formData.CatalogType = parseInt(val.query.catalogType)
         if (val.query.catalogType === '1') {
           this.cardTitle = '自建项目'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/basislist.vue

@@ -543,7 +543,7 @@ export default {
           sort: true
         },
         {
-          prop: 'EffectEndTime',
+          prop: 'ApplyTime',
           label: '有效日期',
           width: 100,
           sort: true

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/goodslist.vue

@@ -545,7 +545,7 @@ export default {
           sort: true
         },
         {
-          prop: 'EffectEndTime',
+          prop: 'ApplyTime',
           label: '有效日期',
           width: 100,
           sort: true

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/index.vue

@@ -602,7 +602,7 @@
             sort: true
           },
           {
-            prop: 'EffectEndTime',
+            prop: 'ApplyTime',
             label: '有效日期',
             width: 100,
             sort: true

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/techlist.vue

@@ -548,7 +548,7 @@ export default {
           sort: true
         },
         {
-          prop: 'EffectEndTime',
+          prop: 'ApplyTime',
           label: '有效日期',
           width: 100,
           sort: true

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/basislist.vue

@@ -706,7 +706,7 @@ import certApi from '@/api/oilsupplier/suppliercert'
             sort: true
           },
           {
-            prop: 'EffectEndTime',
+            prop: 'ApplyTime',
             label: '有效期',
             width: 110,
             sort: true

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/goodslist.vue

@@ -539,7 +539,7 @@
             sort: true
           },
           {
-            prop: 'EffectEndTime',
+            prop: 'ApplyTime',
             label: '有效期',
             width: 110,
             sort: true

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/index.vue

@@ -697,7 +697,7 @@
             sort: true
           },
           {
-            prop: 'EffectEndTime',
+            prop: 'ApplyTime',
             label: '有效期',
             width: 110,
             sort: true

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/techlist.vue

@@ -707,7 +707,7 @@ import certApi from '@/api/oilsupplier/suppliercert'
             sort: true
           },
           {
-            prop: 'EffectEndTime',
+            prop: 'ApplyTime',
             label: '有效期',
             width: 110,
             sort: true