收入目录

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

@@ -74,7 +74,7 @@
         </el-row>
       </el-form>
     </el-card>
-    <el-card class="box-card" v-if="cardType == '7'">
+    <el-card class="box-card">
       <div slot="header">
         <span>
           <i class="icon icon-table2"></i> 收入业务
@@ -120,50 +120,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>
-        <!--<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>
+    <!--<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>-->
 
     <choose-auditor ref="chooseAuditor"
                     @close="setAuditer"
@@ -346,7 +346,6 @@
         }
       }
       var validDate = (rule, value, callback) => {
-        console.log(value)
         if (!value || !value[0] || !value[1]) {
           callback(new Error('请选择时间'))
         } else {
@@ -592,7 +591,7 @@
         this.ValidityDate = [new Date(val.ValidityFrom), new Date(val.ValidityTo)]
         if (this.cardType === '6') {
           this.markettitle = '编辑外部市场目录'
-          this.showaddmarketdialog = true
+          this.showadddialog = true
         } else {
           this.dialogtitle = '编辑收入业务目录'
           this.showadddialog = true
@@ -764,7 +763,6 @@
         // 查询条件
         catapi.getList(myCreateOn, params, this.$axios).then(res => {
           this.entityList = res.data.items
-          console.log(this.entityList, 'this.entityList')
           this.currentItemCount = res.data.currentItemCount
         })
       },

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

@@ -36,16 +36,17 @@
             <router-link :to="'/oilsupplier/oilcatalogsub/' + scope.row.Id + '/incomeedit'">
               <el-button type="primary" plain title="打开" size="mini">打开</el-button>
             </router-link>
-            <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="deleteEntityanditems(scope.row)">删除</el-button>
-              </div>
-              <el-button slot="reference" type="danger" plain title="删除" style="margin-left:10px" size="mini"
-                        v-if="scope.row.Status <= 0">删除</el-button>
-            </el-popover>
+            <!--<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="deleteEntityanditems(scope.row)">删除</el-button>-->
+              <!--</div>-->
+              <!---->
+            <!--</el-popover>-->
+            <el-button slot="reference" type="danger" plain title="删除" style="margin-left:10px" size="mini"
+                       :disabled="scope.row.Status > 0" @click="deleteEntityanditems(scope.row)">删除</el-button>
           </template>
 
         </el-table-column>
@@ -160,22 +161,29 @@
         })
       },
       deleteEntityanditems (row) {
-        api.deleteEntityAndItems(row.Id, this.$axios).then(res => {
-          if (res.data.code === 0) {
-            this.initDatas()
-            this.$message({
-              type: 'success',
-              message: res.data.message
-            })
-          } else {
-            this.$message({
-              type: 'warning',
-              message: res.data.message
-            })
-          }
-        }).catch(err => {
-          console.error(err)
+        this.$confirm('此操作将彻底删除该数据, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         })
+          .then(() => {
+            api.deleteEntityAndItems(row.Id, this.$axios).then(res => {
+              if (res.data.code === 0) {
+                this.initDatas()
+                this.$message({
+                  type: 'success',
+                  message: res.data.message
+                })
+              } else {
+                this.$message({
+                  type: 'warning',
+                  message: res.data.message
+                })
+              }
+            }).catch(err => {
+              console.error(err)
+            })
+          })
       },
 
       searchCommand (command) {