分办

src/dashoo.cn/backend/api/controllers/system/auditsetting.go

@@ -13,7 +13,6 @@ import (
 	"dashoo.cn/backend/api/business/organize"
 	"dashoo.cn/backend/api/business/role"
 	. "dashoo.cn/backend/api/controllers"
-	"dashoo.cn/business2/permission"
 	"dashoo.cn/business2/userRole"
 	"dashoo.cn/utils"
 )
@@ -42,7 +41,7 @@ func (this *OilAuditSettingController) GetEntityList() {
 		}
 	}
 
-	OrganizeId := this.GetString("OrganizeId")
+	//OrganizeId := this.GetString("OrganizeId")
 	OrganizeName := this.GetString("OrganizeName")
 	//	AuditStepCode := this.GetString("AuditStepCode")
 	AuditStepName := this.GetString("AuditStepName")
@@ -53,23 +52,24 @@ func (this *OilAuditSettingController) GetEntityList() {
 	Remark := this.GetString("Remark")
 	CreateOn := this.GetString("CreateOn")
 	Code := this.GetString("Code")
-	svcPerm := permission.GetPermissionService(utils.DBE)
-	isauth := svcPerm.IsAuthorized(this.User.Id, "oil_supplier.AuditSetting.AllRecord")
+	//svcPerm := permission.GetPermissionService(utils.DBE) 0701
+	//isauth := svcPerm.IsAuthorized(this.User.Id, "oil_supplier.AuditSetting.AllRecord") 0701
+
 	//svcuser := organize.GetOrganizeService(utils.DBE)
 	//isauth = svcuser.UserInRoleById(this.User.Id, "10000203")
 
 
-	if !svcPerm.IsAdmin(this.User.Id) && !isauth {
-		//OrganizeId = this.User.DepartmentId //无权限看所有时，只看当前部门的数据
-		var org  organize.Base_Organize
-		orgsvc := organize.GetOrganizeService(utils.DBE)
-		orgsvc.GetEntityById(this.User.DepartmentId, &org)
-		OrganizeId = strconv.Itoa(org.Parentid)
-		if OrganizeId != "" {
-			where = where +
-				" and OrganizeId = '" + OrganizeId + "'"
-		}
-	}
+	//if !svcPerm.IsAdmin(this.User.Id) && !isauth {  0701
+	//	//OrganizeId = this.User.DepartmentId //无权限看所有时，只看当前部门的数据
+	//	var org  organize.Base_Organize
+	//	orgsvc := organize.GetOrganizeService(utils.DBE)
+	//	orgsvc.GetEntityById(this.User.DepartmentId, &org)
+	//	OrganizeId = strconv.Itoa(org.Parentid)
+	//	if OrganizeId != "" {
+	//		where = where +
+	//			" and OrganizeId = '" + OrganizeId + "'"
+	//	}
+	//}
 
 	if OrganizeName != "" {
 		where = where + " and OrganizeName like '%" + OrganizeName + "%'"

src/dashoo.cn/frontend_web/src/components/oilsupplier/chooseauditorfenban.vue

@@ -79,6 +79,10 @@
       visible: {
         type: Boolean,
         default: false
+      },
+      typeCode: {
+        type: String,
+        default: ''
       }
     },
     /*watch: {
@@ -152,7 +156,14 @@
 
         let deptid = data.id
         this.userOptions = []
-        let auditstepcode = 'SUB_OFFICE' // 分办人
+        let auditstepcode = ''
+        if (this.typeCode == '01') {
+          auditstepcode = 'SUB_OFFICE_WZ' // 分办人 物资
+        } else if (this.typeCode == '02') {
+          auditstepcode = 'SUB_OFFICE_JS' // 分办人 基建
+        } else if (this.typeCode == '03') {
+          auditstepcode = 'SUB_OFFICE_JF' // 分办人 技术服务
+        }
         supapi.getFirAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
           this.userOptions = res.data.item
           console.log("---this.userOptions--",this.userOptions)

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -311,7 +311,7 @@
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
       :visible="chooseAuditorVisible"></choose-auditor>
     <choose-auditor-fen ref="chooseAuditorFen" @close="setAuditerFen" @hideChooseAuditer="chooseAuditorVisibleFen=false"
-      :visible="chooseAuditorVisibleFen"></choose-auditor-fen>
+      :visible="chooseAuditorVisibleFen" typeCode="02"></choose-auditor-fen>
 
 
          <el-dialog title="新增文件" :visible.sync="newVisible" top="5vh">
@@ -1263,7 +1263,7 @@ import fileapi from '@/api/oilsupplier/supplierfile'
           })
       },
       chooseAuditorShowFen () {
-        this.$refs['chooseAuditorFen'].getorgtreelist(this.formData.SupplierTypeCode)
+        this.$refs['chooseAuditorFenchooseAuditorFen'].getorgtreelist(this.formData.SupplierTypeCode)
         this.chooseAuditorVisibleFen = true
       },
       setAuditerFen (val, name) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue

@@ -304,7 +304,7 @@
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
       :visible="chooseAuditorVisible"></choose-auditor>
       <choose-auditor-fen ref="chooseAuditorFen" @close="setAuditerFen" @hideChooseAuditer="chooseAuditorVisibleFen=false"
-      :visible="chooseAuditorVisibleFen"></choose-auditor-fen>
+      :visible="chooseAuditorVisibleFen" typeCode="01"></choose-auditor-fen>
 
       <el-dialog title="新增文件" :visible.sync="newVisible" top="5vh">
       <el-form :model="newSubfileForm" label-width="100px">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/techdataopera.vue

@@ -279,7 +279,7 @@
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
       :visible="chooseAuditorVisible"></choose-auditor>
       <choose-auditor-fen ref="chooseAuditorFen" @close="setAuditerFen" @hideChooseAuditer="chooseAuditorVisibleFen=false"
-      :visible="chooseAuditorVisibleFen"></choose-auditor-fen>
+      :visible="chooseAuditorVisibleFen" typeCode="03"></choose-auditor-fen>
 
 
 
@@ -321,7 +321,7 @@
         <el-button @click="newVisible = false">取 消</el-button>
         <el-button type="primary" @click="makeNewSure()">确 定</el-button>
       </div>
-    </el-dialog>    
+    </el-dialog>
   </div>
 </template>
 

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

@@ -662,13 +662,17 @@
               if (this.inStyle == '1') {
                 this.shenheForm.AuditorRemark = '集中评审通过。'
               } else if (this.inStyle == '2') {
-                this.shenheForm.AuditorRemark = '一级物资备案准入'
+                this.shenheForm.AuditorRemark = '一级物资备案准入。'
               } else if (this.inStyle == '3') {
-                this.shenheForm.AuditorRemark = '二级物资备案准入'
+                this.shenheForm.AuditorRemark = '二级物资备案准入。'
               } else if (this.inStyle == '4') {
-                this.shenheForm.AuditorRemark = '战略合作准入'
+                this.shenheForm.AuditorRemark = '战略合作准入。'
               } else if (this.inStyle == '5') {
                 this.shenheForm.AuditorRemark = '集中评审通过。'
+              } else if (this.inStyle == '6') {
+                this.shenheForm.AuditorRemark = '外部市场准入通过。'
+              } else {
+                this.shenheForm.AuditorRemark = '集中评审通过。'
               }
             } else if (this.formData.Status === '10') {
               this.auditTitle = '分办'

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

@@ -710,13 +710,17 @@
               if (this.inStyle == '1') {
                 this.shenheForm.AuditorRemark = '集中评审通过。'
               } else if (this.inStyle == '2') {
-                this.shenheForm.AuditorRemark = '一级物资备案准入'
+                this.shenheForm.AuditorRemark = '一级物资备案准入。'
               } else if (this.inStyle == '3') {
-                this.shenheForm.AuditorRemark = '二级物资备案准入'
+                this.shenheForm.AuditorRemark = '二级物资备案准入。'
               } else if (this.inStyle == '4') {
-                this.shenheForm.AuditorRemark = '战略合作准入'
+                this.shenheForm.AuditorRemark = '战略合作准入。'
               } else if (this.inStyle == '5') {
                 this.shenheForm.AuditorRemark = '集中评审通过。'
+              } else if (this.inStyle == '6') {
+                this.shenheForm.AuditorRemark = '外部市场准入通过。'
+              } else {
+                this.shenheForm.AuditorRemark = '集中评审通过。'
               }
             }
             this.$refs['equipmentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)

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

@@ -659,13 +659,17 @@
               if (this.inStyle == '1') {
                 this.shenheForm.AuditorRemark = '集中评审通过。'
               } else if (this.inStyle == '2') {
-                this.shenheForm.AuditorRemark = '一级物资备案准入'
+                this.shenheForm.AuditorRemark = '一级物资备案准入。'
               } else if (this.inStyle == '3') {
-                this.shenheForm.AuditorRemark = '二级物资备案准入'
+                this.shenheForm.AuditorRemark = '二级物资备案准入。'
               } else if (this.inStyle == '4') {
-                this.shenheForm.AuditorRemark = '战略合作准入'
+                this.shenheForm.AuditorRemark = '战略合作准入。'
               } else if (this.inStyle == '5') {
                 this.shenheForm.AuditorRemark = '集中评审通过。'
+              } else if (this.inStyle == '6') {
+                this.shenheForm.AuditorRemark = '外部市场准入通过。'
+              } else {
+                this.shenheForm.AuditorRemark = '集中评审通过。'
               }
 
             }

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

@@ -33,19 +33,19 @@
               <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="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
-              </div>
-              <el-button slot="reference" type="primary" plain title="删除" style="margin-left:3px" size="mini">删除</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="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>-->
+              <!--</div>-->
+              <!--<el-button slot="reference" type="primary" plain title="删除" style="margin-left:3px" size="mini">删除</el-button>-->
+            <!--</el-popover>-->
           </template>
         </el-table-column>
 
@@ -79,7 +79,7 @@
               <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-        
+
          <!-- <el-col :span="12">
           <el-form-item label="供应商类型">
             <el-select  size="mini" v-model="searchForm.OperType" placeholder="请选择" style="width: 100%">
@@ -140,8 +140,8 @@
             <el-input size="mini" v-model="searchForm.PACNumber" maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
- 
- 
+
+
         <el-col :span="12">
           <el-form-item label="统一社会信用代码">
             <el-input size="mini" v-model="searchForm.CommercialNo" maxlength="50" placeholder="请输入" style="width: 100%"></el-input>
@@ -260,7 +260,7 @@
               <el-input size="mini" v-model="searchForm.BusinessScope" placeholder="请输入内容"></el-input>
             </el-form-item>
         </el-col>
-       
+
        </el-row>
 
       </el-form>

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

@@ -33,19 +33,19 @@
               <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="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
-              </div>
-              <el-button slot="reference" type="primary" plain title="删除" style="margin-left:3px" size="mini">删除</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="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>-->
+              <!--</div>-->
+              <!--<el-button slot="reference" type="primary" plain title="删除" style="margin-left:3px" size="mini">删除</el-button>-->
+            <!--</el-popover>-->
           </template>
         </el-table-column>
 
@@ -79,7 +79,7 @@
               <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-        
+
          <el-col :span="12">
           <el-form-item label="供应商类型">
             <el-select  size="mini" v-model="searchForm.OperType" placeholder="请选择" style="width: 100%">
@@ -140,8 +140,8 @@
             <el-input size="mini" v-model="searchForm.PACNumber" maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
- 
- 
+
+
         <el-col :span="12">
           <el-form-item label="统一社会信用代码">
             <el-input size="mini" v-model="searchForm.CommercialNo" maxlength="50" placeholder="请输入" style="width: 100%"></el-input>
@@ -260,7 +260,7 @@
               <el-input size="mini" v-model="searchForm.BusinessScope" placeholder="请输入内容"></el-input>
             </el-form-item>
         </el-col>
-       
+
        </el-row>
 
       </el-form>

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

@@ -45,19 +45,19 @@
               <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="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
-              </div>
-              <el-button slot="reference" type="primary" plain title="删除" style="margin-left:3px" size="mini">删除</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="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>-->
+              <!--</div>-->
+              <!--<el-button slot="reference" type="primary" plain title="删除" style="margin-left:3px" size="mini">删除</el-button>-->
+            <!--</el-popover>-->
           </template>
         </el-table-column>
         <el-table-column v-for="column in tableColumns" :key="column.Id"

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

@@ -33,19 +33,19 @@
               <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="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
-              </div>
-              <el-button slot="reference" type="primary" plain title="删除" style="margin-left:3px" size="mini">删除</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="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>-->
+              <!--</div>-->
+              <!--<el-button slot="reference" type="primary" plain title="删除" style="margin-left:3px" size="mini">删除</el-button>-->
+            <!--</el-popover>-->
           </template>
         </el-table-column>
 
@@ -79,7 +79,7 @@
               <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-        
+
          <!-- <el-col :span="12">
           <el-form-item label="供应商类型">
             <el-select  size="mini" v-model="searchForm.OperType" placeholder="请选择" style="width: 100%">
@@ -140,8 +140,8 @@
             <el-input size="mini" v-model="searchForm.PACNumber" maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
- 
- 
+
+
         <el-col :span="12">
           <el-form-item label="统一社会信用代码">
             <el-input size="mini" v-model="searchForm.CommercialNo" maxlength="50" placeholder="请输入" style="width: 100%"></el-input>
@@ -260,7 +260,7 @@
               <el-input size="mini" v-model="searchForm.BusinessScope" placeholder="请输入内容"></el-input>
             </el-form-item>
         </el-col>
-       
+
        </el-row>
 
       </el-form>

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

@@ -33,19 +33,19 @@
               <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="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
-              </div>
-              <el-button slot="reference" type="primary" plain title="删除" style="margin-left:3px" size="mini">删除</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="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>-->
+              <!--</div>-->
+              <!--<el-button slot="reference" type="primary" plain title="删除" style="margin-left:3px" size="mini">删除</el-button>-->
+            <!--</el-popover>-->
           </template>
         </el-table-column>
         <el-table-column min-width="110" align="center" prop="InFlag" label="准入标识" show-overflow-tooltip>
@@ -85,7 +85,7 @@
               <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-        
+
          <!-- <el-col :span="12">
           <el-form-item label="供应商类型">
             <el-select  size="mini" v-model="searchForm.OperType" placeholder="请选择" style="width: 100%">
@@ -146,8 +146,8 @@
             <el-input size="mini" v-model="searchForm.PACNumber" maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
- 
- 
+
+
         <el-col :span="12">
           <el-form-item label="统一社会信用代码">
             <el-input size="mini" v-model="searchForm.CommercialNo" maxlength="50" placeholder="请输入" style="width: 100%"></el-input>
@@ -266,7 +266,7 @@
               <el-input size="mini" v-model="searchForm.BusinessScope" placeholder="请输入内容"></el-input>
             </el-form-item>
         </el-col>
-       
+
        </el-row>
 
       </el-form>

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

@@ -33,19 +33,19 @@
               <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="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
-              </div>
-              <el-button slot="reference" type="primary" plain title="删除" style="margin-left:3px" size="mini">删除</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="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>-->
+              <!--</div>-->
+              <!--<el-button slot="reference" type="primary" plain title="删除" style="margin-left:3px" size="mini">删除</el-button>-->
+            <!--</el-popover>-->
           </template>
         </el-table-column>
         <el-table-column min-width="110" align="center" prop="InFlag" label="准入标识" show-overflow-tooltip>
@@ -85,7 +85,7 @@
               <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-        
+
          <el-col :span="12">
           <el-form-item label="供应商类型">
             <el-select  size="mini" v-model="searchForm.OperType" placeholder="请选择" style="width: 100%">
@@ -146,8 +146,8 @@
             <el-input size="mini" v-model="searchForm.PACNumber" maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
- 
- 
+
+
         <el-col :span="12">
           <el-form-item label="统一社会信用代码">
             <el-input size="mini" v-model="searchForm.CommercialNo" maxlength="50" placeholder="请输入" style="width: 100%"></el-input>
@@ -266,7 +266,7 @@
               <el-input size="mini" v-model="searchForm.BusinessScope" placeholder="请输入内容"></el-input>
             </el-form-item>
         </el-col>
-       
+
        </el-row>
 
       </el-form>

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

@@ -45,19 +45,19 @@
               <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="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
-              </div>
-              <el-button slot="reference" type="primary" plain title="删除" style="margin-left:3px" size="mini">删除</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="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>-->
+              <!--</div>-->
+              <!--<el-button slot="reference" type="primary" plain title="删除" style="margin-left:3px" size="mini">删除</el-button>-->
+            <!--</el-popover>-->
           </template>
         </el-table-column>
         <el-table-column min-width="110" align="center" prop="InFlag" label="准入标识" show-overflow-tooltip>

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

@@ -33,19 +33,19 @@
               <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="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
-              </div>
-              <el-button slot="reference" type="primary" plain title="删除" style="margin-left:3px" size="mini">删除</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="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>-->
+              <!--</div>-->
+              <!--<el-button slot="reference" type="primary" plain title="删除" style="margin-left:3px" size="mini">删除</el-button>-->
+            <!--</el-popover>-->
           </template>
         </el-table-column>
         <el-table-column min-width="110" align="center" prop="InFlag" label="准入标识" show-overflow-tooltip>
@@ -85,7 +85,7 @@
               <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-        
+
          <!-- <el-col :span="12">
           <el-form-item label="供应商类型">
             <el-select  size="mini" v-model="searchForm.OperType" placeholder="请选择" style="width: 100%">
@@ -146,8 +146,8 @@
             <el-input size="mini" v-model="searchForm.PACNumber" maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
- 
- 
+
+
         <el-col :span="12">
           <el-form-item label="统一社会信用代码">
             <el-input size="mini" v-model="searchForm.CommercialNo" maxlength="50" placeholder="请输入" style="width: 100%"></el-input>
@@ -266,7 +266,7 @@
               <el-input size="mini" v-model="searchForm.BusinessScope" placeholder="请输入内容"></el-input>
             </el-form-item>
         </el-col>
-       
+
        </el-row>
 
       </el-form>