前端: 目录管理调整

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

@@ -52,7 +52,7 @@
             <el-button slot="reference" type="danger" title="删除" style="margin-left:10px" size="mini" @click="deleteClick(scope.row)" plain :disabled="!showBtn">删除</el-button>
           </template>
         </el-table-column>
-        <el-table-column label="序号" align="center" min-width="70">
+        <el-table-column label="序号" align="center" width="70">
           <template slot-scope="scope">
             <span>{{scope.$index+(currentPage - 1) * size + 1}} </span>
           </template>
@@ -64,12 +64,12 @@
             {{(jsTimeHandleForInCome(scope.row.ValidityTo))}}
           </template>
         </el-table-column>
+        <el-table-column sortable width="150" 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 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 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>
@@ -525,6 +525,7 @@
           _size: this.size,
           Order: this.Column.Order,
           Prop: this.Column.Prop,
+          Status: '2',
           CatalogType: this.formData.CatalogType
         }
         let myCreateOn = []

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

@@ -63,7 +63,7 @@
         <el-table-column sortable min-width="400" align="left" prop="Business" label="业务范围"></el-table-column>
         <el-table-column sortable width="100" align="center" show-overflow-tooltip label="有效期至">
           <template slot-scope="scope">
-            {{(jsTimeHandle(scope.row.ValidityTo))}}
+            {{jsTimeHandle(scope.row.ValidityTo)}}
           </template>
         </el-table-column>
         <el-table-column sortable min-width="90" align="center" :key="Math.random()" v-if="formData.CatalogType == 4 || formData.CatalogType == 5" show-overflow-tooltip prop="DutyDept" label="责任部室"></el-table-column>

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

@@ -45,7 +45,7 @@
             <el-button type="primary" size="mini" @click="editOilCataLog(scope.row)" plain>查看</el-button>
           </template>
         </el-table-column>
-        <el-table-column label="序号" align="center" min-width="70">
+        <el-table-column label="序号" align="center" width="70">
           <template slot-scope="scope">
             <span>{{scope.$index+(currentPage - 1) * size + 1}} </span>
           </template>
@@ -57,12 +57,12 @@
             {{(jsTimeHandleForInCome(scope.row.ValidityTo))}}
           </template>
         </el-table-column>
+        <el-table-column sortable width="150" 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 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 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>
@@ -303,6 +303,7 @@
           _size: this.size,
           Order: this.Column.Order,
           Prop: this.Column.Prop,
+          Status: '2',
           CatalogType: this.formData.CatalogType
         }
         let myCreateOn = []

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

@@ -59,7 +59,7 @@
         <el-table-column sortable min-width="400" align="left" prop="Business" label="业务范围"></el-table-column>
         <el-table-column sortable width="125" align="center" show-overflow-tooltip label="有效期至">
           <template slot-scope="scope">
-            {{(jsTimeHandle(scope.row.ValidityTo))}}
+            {{jsTimeHandle(scope.row.ValidityTo)}}
           </template>
         </el-table-column>
         <el-table-column sortable min-width="90" align="center" :key="Math.random()" v-if="formData.CatalogType == 4 || formData.CatalogType == 5" show-overflow-tooltip prop="DutyDept" label="责任部室"></el-table-column>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/oilcatalogsub/_opera/incomeedit.vue

@@ -3,7 +3,7 @@
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
       <el-breadcrumb-item :to="{ path: '/oilsupplier/oilcatalogsub' }">{{this.formDataType}}</el-breadcrumb-item>
-      <el-breadcrumb-item>添加</el-breadcrumb-item>
+      <el-breadcrumb-item><span v-if="formData.Status <= 0 && isEdit">编辑</span><span v-else>查看</span></el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card">
       <div slot="header">
@@ -16,9 +16,10 @@
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="approvalEntity" v-if="auditBtn && formData.Status == 2">复审</el-button>
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="approvalEntity" v-if="auditBtn && formData.Status == 5">审批</el-button>
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="authHistory">审批流程</el-button>
-            <router-link :to="'/oilsupplier/oilcatalog?catalogType=7'">
-            <el-button type="warning" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="isEdit && formData.Status <= 0">返回</el-button>
-          </router-link>
+            <!--<router-link :to="'/oilsupplier/oilcatalog?catalogType=7'">-->
+            <router-link :to="'/oilsupplier/oilcatalogsub'">
+              <el-button type="warning" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="isEdit && formData.Status <= 0">返回</el-button>
+            </router-link>
           </span>
         </div>
       </div>
@@ -161,7 +162,7 @@
         <el-table-column sortable min-width="500" align="center" show-overflow-tooltip prop="Business" label="业务范围"></el-table-column>
         <el-table-column sortable width="100" align="center" show-overflow-tooltip label="有效期至">
           <template slot-scope="scope">
-            {{(jsTimeHandle(scope.row.ValidityTo))}}
+            {{jsTimeHandle(scope.row.ValidityTo)}}
           </template>
         </el-table-column>
         <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Remark" label="备注"></el-table-column>
@@ -553,7 +554,7 @@
       isAccess () {
         let params = {
           id: this.formData.Id,
-          auditStepCode: this.auditStepCode,
+          auditstepcode: this.auditStepCode,
           processkey: this.formData.ProcessKey
         }
         apiCert.isAccess(params, this.$axios).then(res => {

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

@@ -2,7 +2,7 @@
   <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item></el-breadcrumb-item>
+      <el-breadcrumb-item>目录申请表</el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card" style="height: calc(100vh - 115px);">
       <div slot="header">