bug 删除准入条目，不显示 准入申请按钮

Signed-off-by: lijunqing <lijunqing@dashoo.cn>

src/dashoo.cn/backend/api/controllers/oilsupplier/supplier.go

@@ -1,6 +1,7 @@
 package oilsupplier
 
 import (
+	"dashoo.cn/backend/api/business/oilsupplier/suppliercertsub"
 	"encoding/json"
 	"fmt"
 	"strconv"
@@ -2158,6 +2159,49 @@ func (this *OilSupplierController) DeleteEntity() {
 	}
 }
 
+// @Title 删除单条信息
+// @Description
+// @Success 200 {object} ErrorInfo
+// @Failure 403 :id 为空
+// @router /deleteall/:Id/:SupplierTypeCode [delete]
+func (this *OilSupplierController) DeleteAllEntity() {
+	Id := this.Ctx.Input.Param(":Id")
+	SupplierTypeCode := this.Ctx.Input.Param(":SupplierTypeCode")
+	var errinfo ErrorInfo
+	if Id == "" {
+		errinfo.Message = "操作失败！请求信息不完整"
+		errinfo.Code = -2
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+	svc := supplier.GetOilSupplierService(utils.DBE)
+	err:=svc.DeleteEntityBytbl(OilSupplierCertName,"SupplierId="+Id+" and SupplierTypeCode='"+SupplierTypeCode+"'")
+	err =svc.DeleteEntityBytbl(OilSupplierCert2FileName,"SupplierId="+Id+" and SupplierTypeCode='"+SupplierTypeCode+"'")
+	err =svc.DeleteEntityBytbl(OilSupplierFileName,"SupplierId="+Id+" and SupplierTypeCode='"+SupplierTypeCode+"'")
+
+	var model1 suppliercertsub.OilSupplierCert2File
+	count1, _ := svc.GetCount(&model1, "SupplierId="+Id)
+	if count1==0{
+		err=svc.DeleteEntityBytbl(OilSupplierFileName,"SupplierId="+Id)
+	}
+	var model2 suppliercert.OilSupplierCert
+	count2, _ := svc.GetCount(&model2, "SupplierId="+Id)
+	if count2==0{
+		err=svc.DeleteEntityBytbl(OilSupplierName,"SupplierId="+Id)
+	}
+	if err == nil {
+		errinfo.Message = "删除成功"
+		errinfo.Code = 0
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "删除失败！" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}
 // @Title 判断是否可以申请准入
 // @Description
 // @Success 200 {string} Count

src/dashoo.cn/frontend_web/src/api/oilsupplier/supplier.js

@@ -92,6 +92,12 @@ export default {
       method: 'delete'
     })
   },
+  deleteAllEntity (entityId, supplierTypeCode, myAxios) {
+    return myAxios({
+      url: '/supplier/deleteall/' + entityId + '/' + supplierTypeCode,
+      method: 'delete'
+    })
+  },
   isCanApply (typeCode, myAxios) {
     return myAxios({
       url: '/supplier/iscanapply/' + typeCode,

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/basisedit.vue

@@ -542,14 +542,17 @@
         flag: '02',
         rules: {
           WorkerTotal: [{
+            required:true,
             validator: checkWorkerTotal,
             trigger: 'blur'
           }],
           TechnicalNum: [{
+            required:true,
             validator: checkTechnicalNum,
             trigger: 'blur'
           }],
           SkillerTotal: [{
+            required:true,
             validator: checkSkillerTotal,
             trigger: 'blur'
           }]
@@ -821,6 +824,9 @@
             if ((this.formData.Status > 0) && (this.formData.Status != 4)) {
               this.delete_flat = false
             }
+            if ((this.formData.Status > 0) &&(this.authUser.Profile.IsCompanyUser==1)) {
+              this.delete_flat = false
+            }
             if (this.formData.CredentialFlag != "") {
               this.$refs["BasisInfo"].showorhid(this.formData.CredentialFlag)
             }

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/goodsedit.vue

@@ -847,6 +847,9 @@
               if ((this.formData.Status > 0) && (this.formData.Status != 4)) {
                 this.delete_flat = false
               }
+              if ((this.formData.Status > 0) &&(this.authUser.Profile.IsCompanyUser==1)) {
+                this.delete_flat = false
+              }
 
               if (this.formData.CredentialFlag != "") {
                 this.$refs["GoodsInfo"].showorhid(this.formData.CredentialFlag)

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/techedit.vue

@@ -537,14 +537,17 @@
         flag: '03',
         rules: {
           WorkerTotal: [{
+            required:true,
             validator: checkWorkerTotal,
             trigger: 'blur'
           }],
           TechnicalNum: [{
+            required:true,
             validator: checkTechnicalNum,
             trigger: 'blur'
           }],
           SkillerTotal: [{
+            required:true,
             validator: checkSkillerTotal,
             trigger: 'blur'
           }]
@@ -816,6 +819,9 @@
             if ((this.formData.Status > 0) && (this.formData.Status != 4)) {
               this.delete_flat = false
             }
+            if ((this.formData.Status > 0) &&(this.authUser.Profile.IsCompanyUser==1)) {
+              this.delete_flat = false
+            }
             if (this.formData.CredentialFlag != "") {
               this.$refs["TechInfo"].showorhid(this.formData.CredentialFlag)
             }

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

@@ -49,7 +49,7 @@
               <div style="text-align: right; margin: 0">
                 <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
               </div>
-              <el-button slot="reference" type="text" title="删除" style="margin-left:10px" size="mini" icon="el-icon-delete">删除</el-button>
+              <el-button slot="reference" v-if="scope.row.Status=='0' || scope.row.Status=='' || scope.row.Status=='-1' || scope.row.Status=='-2' || scope.row.Status=='-4'" type="text" title="删除" style="margin-left:10px" size="mini" icon="el-icon-delete">删除</el-button>
             </el-popover>
           </template>
         </el-table-column>
@@ -1005,9 +1005,10 @@
       },
       deleteEntity(row) {
         row.deleteConfirmFlag = false;
-        api.deleteEntity(row.Id, this.$axios).then(res => {
+        api.deleteAllEntity(row.Id,row.SupplierTypeCode, this.$axios).then(res => {
           if (res.data.code === 0) {
             this.initDatas();
+            this.isCanApply();
             this.$message({
               type: 'success',
               message: res.data.message

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

@@ -49,7 +49,7 @@
               <div style="text-align: right; margin: 0">
                 <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
               </div>
-              <el-button slot="reference" type="text" title="删除" style="margin-left:10px" size="mini" icon="el-icon-delete">删除</el-button>
+              <el-button slot="reference" v-if="scope.row.Status=='0' || scope.row.Status=='' || scope.row.Status=='-1' || scope.row.Status=='-2' || scope.row.Status=='-4'"  type="text" title="删除" style="margin-left:10px" size="mini" icon="el-icon-delete">删除</el-button>
             </el-popover>
           </template>
         </el-table-column>
@@ -1002,9 +1002,10 @@
       },
       deleteEntity(row) {
         row.deleteConfirmFlag = false;
-        api.deleteEntity(row.Id, this.$axios).then(res => {
+        api.deleteAllEntity(row.Id,row.SupplierTypeCode, this.$axios).then(res => {
           if (res.data.code === 0) {
             this.initDatas();
+            this.isCanApply();
             this.$message({
               type: 'success',
               message: res.data.message

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

@@ -49,7 +49,7 @@
               <div style="text-align: right; margin: 0">
                 <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
               </div>
-              <el-button slot="reference" type="text" title="删除" style="margin-left:10px" size="mini" icon="el-icon-delete">删除</el-button>
+              <el-button slot="reference" v-if="scope.row.Status=='0' || scope.row.Status=='' || scope.row.Status=='-1' || scope.row.Status=='-2' || scope.row.Status=='-4'" type="text" title="删除" style="margin-left:10px" size="mini" icon="el-icon-delete">删除</el-button>
             </el-popover>
           </template>
         </el-table-column>
@@ -1008,9 +1008,10 @@
       },
       deleteEntity(row) {
         row.deleteConfirmFlag = false;
-        api.deleteEntity(row.Id, this.$axios).then(res => {
+        api.deleteAllEntity(row.Id,row.SupplierTypeCode, this.$axios).then(res => {
           if (res.data.code === 0) {
             this.initDatas();
+            this.isCanApply();
             this.$message({
               type: 'success',
               message: res.data.message

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/basisedit.vue

@@ -596,6 +596,12 @@
             if (this.formData.Status != 4) {
               this.delete_flat = false
             }
+            if ((this.formData.Status > 0) && (this.formData.Status != 4)) {
+              this.delete_flat = false
+            }
+            if ((this.formData.Status > 0) &&(this.authUser.Profile.IsCompanyUser==1)) {
+              this.delete_flat = false
+            }
             this.formDataCert.WorkerTotal = this.formData.WorkerTotal
             this.formDataCert.ContractNum = this.formData.ContractNum
             this.formDataCert.UniversityNum = this.formData.UniversityNum

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/goodsedit.vue

@@ -645,6 +645,12 @@
             if (this.formData.Status != 4) {
                 this.delete_flat = false
             }
+            if ((this.formData.Status > 0) && (this.formData.Status != 4)) {
+              this.delete_flat = false
+            }
+            if ((this.formData.Status > 0) &&(this.authUser.Profile.IsCompanyUser==1)) {
+              this.delete_flat = false
+            }
             console.log("--this.formData--", this.formData)
             this.formDataCert.WorkerTotal = this.formData.WorkerTotal
             this.formDataCert.ContractNum = this.formData.ContractNum

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/techedit.vue

@@ -593,6 +593,12 @@
             if (this.formData.Status != 4) {
                 this.delete_flat = false
             }
+            if ((this.formData.Status > 0) && (this.formData.Status != 4)) {
+              this.delete_flat = false
+            }
+            if ((this.formData.Status > 0) &&(this.authUser.Profile.IsCompanyUser==1)) {
+              this.delete_flat = false
+            }
             this.formDataCert.WorkerTotal = this.formData.WorkerTotal
             this.formDataCert.ContractNum = this.formData.ContractNum
             this.formDataCert.UniversityNum = this.formData.UniversityNum