2
3
lining 6 rokov pred
rodič
commit
7a06a1c5f4

+ 4 - 0
src/dashoo.cn/backend/api/controllers/oilsupplier/goodsaptitude.go

@@ -1928,6 +1928,7 @@ func (this *OilGoodsAptitudeController) DelTmpSupplierCertSub() {
 	defer session.Close()
 
 	supplierId := this.GetString("SupplierId")
+	id := this.GetString("Id")
 
 	svc := goodsaptitude.GetOilGoodsAptitudeSession(session)
 
@@ -1936,6 +1937,9 @@ func (this *OilGoodsAptitudeController) DelTmpSupplierCertSub() {
 	if supplierId != "" {
 		wheredel += " and SupplierId=" + supplierId
 	}
+	if id != "" {
+		wheredel += " and Id=" + id
+	}
 	svc.GetEntitysByWhere(TmpOilSupplierCertSubName, wheredel, &supplierCertSubList)
 
 	var errinfo ErrorInfo

+ 37 - 3
src/dashoo.cn/frontend_web/src/pages/oilsupplier/goodsaptitude/_opera/showdelcertsub.vue

@@ -32,7 +32,7 @@
           </el-form-item>
           <el-form-item>
            <!--<el-button type="primary" size="mini" @click="exportExcel">导出</el-button>-->
-            <el-button type="warning" size="mini" @click="delSupplierCertSub">删除准入项</el-button>
+            <el-button type="warning" size="mini" @click="delSupplierCertSub">删除全部准入项</el-button>
             <router-link :to="'/oilsupplier/goodsaptitude'">
               <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" >返回</el-button>
             </router-link>
@@ -52,8 +52,8 @@
         style="width: 100%" @sort-change="orderby" >
         <el-table-column label="操作" width="260px" align="center" fixed="right" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-button type="text" @click="opencertsub(scope.row)" title="导出" size="mini" icon="el-icon-document" width="120px">待删除准入范围</el-button>
-            <el-button type="text" style="color: red" @click="delcertsub(scope.row)" title="删除" size="mini" icon="el-icon-delete" width="120px">删除准入范围</el-button>
+            <el-button type="text" @click="opencertsub(scope.row)" title="查看待删除准入范围" size="mini" icon="el-icon-document" width="120px">待删除准入范围</el-button>
+            <el-button type="text" style="color: #F56C6C" @click="delcertsub(scope.row)" title="删除" size="mini" icon="el-icon-delete" width="120px">删除准入范围</el-button>
             <!--<el-button type="text" @click="openfilelist(scope.row)" title="导出" size="mini" icon="el-icon-document" width="120px">企业资质</el-button>-->
           </template>
         </el-table-column>
@@ -195,6 +195,11 @@
               </span>
             </div>
             <el-table :data="certsubList" border size="mini">
+              <el-table-column label="操作" width="160px" align="center" fixed="right" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  <el-button type="text" style="color: #F56C6C" @click="delcertsubbyid(scope.row)" title="删除" size="mini" icon="el-icon-delete" width="90px">删除</el-button>
+                </template>
+              </el-table-column>
               <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>
               <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
               <el-table-column prop="GoodsLevel" label="级别" width="80px" show-overflow-tooltip>
@@ -408,7 +413,36 @@ export default {
   },
 
   methods: {
+    delcertsubbyid (row) {
+      console.log(row)
+      this.$confirm('是否删除准入项?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let params = {
+          Id: row.Id
+        }
+        console.log(params)
+        api.delTmpSupplierCertSub(params, this.$axios).then(res => {
+          console.log(res)
+          if (res.data.code === 0) {
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+            this.getCertSub()
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        })
+      })
+    },
     delcertsub (row) {
+      console.log(row)
       this.$confirm('是否删除该公司的准入项?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',