前:收入业务和市场明细分开

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

@@ -2,7 +2,7 @@
   <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/oilsupplier/oilcatalogsub' }">收入业务</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilsupplier/oilcatalogsub' }">{{this.formDataType}}</el-breadcrumb-item>
       <el-breadcrumb-item>添加</el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card">
@@ -88,7 +88,7 @@
         </el-row>
       </el-form>
     </el-card>
-    <el-card class="box-card">
+    <el-card class="box-card" v-if="cardType === '7'">
       <div slot="header">
         <span>
           <i class="icon icon-table2"></i> 收入业务
@@ -134,50 +134,50 @@
     </el-card>
 
 
-    <!--<el-card class="box-card" v-if="cardType == '6'">-->
-      <!--<div slot="header">-->
-        <!--<span>-->
-          <!--<i class="icon icon-table2"></i> 外部市场-->
-          <!--<span style="float: right;">-->
-            <!--<el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="addMarketItems" v-if="isEdit && formData.Status <= 0">添加明细</el-button>-->
-          <!--</span>-->
-        <!--</span>-->
-      <!--</div>-->
-      <!--<el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby" size="mini">-->
-        <!--<el-table-column label="操作" width="150px" align="center" fixed="right">-->
-          <!--<template slot-scope="scope">-->
-            <!--<el-button type="primary" size="mini" @click="editOilcatalog(scope.row)" plain>编辑</el-button>-->
-            <!--<el-popover placement="top" title="提示">-->
-              <!--<el-alert-->
-                <!--title=""-->
-                <!--description="确认要删除吗？"-->
-                <!--type="warning"-->
-                <!--:closable="false">-->
-              <!--</el-alert>-->
-              <!--<br/>-->
-              <!--<div style="text-align: right; margin: 0">-->
-                <!--<el-button type="danger" size="mini" @click="deleteEntity(scope.row)">删除</el-button>-->
-              <!--</div>-->
-              <!--<el-button slot="reference" type="danger" title="删除" style="margin-left:10px" size="mini" plain v-if="isEdit && scope.row.Status == 0">删除</el-button>-->
-            <!--</el-popover>-->
-          <!--</template>-->
-
-        <!--</el-table-column>-->
-        <!--&lt;!&ndash;<el-table-column sortable min-width="80" align="center" show-overflow-tooltip prop="SupplierName" label="序号"></el-table-column>&ndash;&gt;-->
-        <!--<el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="CompanyName" label="企业名称"></el-table-column>-->
-        <!--<el-table-column sortable min-width="500" align="center" show-overflow-tooltip prop="Business" label="业务范围"></el-table-column>-->
-        <!--<el-table-column sortable min-width="200" align="center" show-overflow-tooltip label="有效期起止">-->
-          <!--<template slot-scope="scope">-->
-            <!--{{(jstimehandle(scope.row.ValidityFrom))}}&#45;&#45;{{(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>-->
-
-      <!--</el-table>-->
-      <!--<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"-->
-                     <!--:page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">-->
-      <!--</el-pagination>-->
-    <!--</el-card>-->
+    <el-card class="box-card" v-else>
+      <div slot="header">
+        <span>
+          <i class="icon icon-table2"></i> 外部市场
+          <span style="float: right;">
+            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="addMarketItems" v-if="isEdit && formData.Status <= 0">添加明细</el-button>
+          </span>
+        </span>
+      </div>
+      <el-table :data="entityList" border style="width: 100%" @sort-change="orderby" size="mini">
+        <el-table-column label="操作" width="150px" align="center" fixed="right">
+          <template slot-scope="scope">
+            <el-button type="primary" size="mini" @click="editOilcatalog(scope.row)" plain>编辑</el-button>
+            <el-popover placement="top" title="提示">
+              <el-alert
+                title=""
+                description="确认要删除吗？"
+                type="warning"
+                :closable="false">
+              </el-alert>
+              <br/>
+              <div style="text-align: right; margin: 0">
+                <el-button type="danger" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
+              </div>
+              <el-button slot="reference" type="danger" title="删除" style="margin-left:10px" size="mini" plain v-if="isEdit && scope.row.Status == 0">删除</el-button>
+            </el-popover>
+          </template>
+
+        </el-table-column>
+        <!--<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="500" align="center" show-overflow-tooltip prop="Business" label="业务范围"></el-table-column>
+        <el-table-column sortable min-width="200" align="center" show-overflow-tooltip label="有效期起止">
+          <template slot-scope="scope">
+            {{(jstimehandle(scope.row.ValidityFrom))}}--{{(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>
+
+      </el-table>
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+      </el-pagination>
+    </el-card>
 
     <choose-auditor ref="chooseAuditor"
                     @close="setAuditer"
@@ -259,7 +259,7 @@
           <el-col :span="12">
             <el-form-item label="有效期" prop="ValidityDate">
               <el-date-picker v-model="ValidityDate" type="daterange" range-separator="至"
-                              start-placeholder="有效期起" end-placeholder="有效期止"></el-date-picker>
+                              start-placeholder="有效期起" end-placeholder="有效期止" style="width: 100%"></el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
@@ -501,8 +501,10 @@
       this.formData.Type = this.$route.query.type
       if (this.$route.query.type == 6) {
         this.formDataType = '外部市场'
+        this.cardType = '6'
       } else {
         this.formDataType = '收入业务'
+        this.cardType = '7'
       }
       console.log(this.$route.query.type, 'params.opera')
       Object.assign(this.incomeDataTmp, this.incomeData)
@@ -636,7 +638,7 @@
         this.ValidityDate = [new Date(val.ValidityFrom), new Date(val.ValidityTo)]
         if (this.cardType === '6') {
           this.markettitle = '编辑外部市场目录'
-          this.showadddialog = true
+          this.showaddmarketdialog = true
         } else {
           this.dialogtitle = '编辑收入业务目录'
           this.showadddialog = true
@@ -934,7 +936,7 @@
         this.initDatas()
       },
       jstimehandle (val) {
-        if (val === '') {
+        if (val === '' || val === '0001-01-01T00:00:00Z') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
           return '----'