基建增项分类添加

src/dashoo.cn/backend/api/business/oilsupplier/suppliercertappendsub/oilsuppliercertappendsub.go

@@ -10,6 +10,7 @@ type OilSupplierCertAppendSub struct {
 	SupplierCertId       int       `xorm:"not null comment('供方准入证书信息表主键') INT(10)"`
 	SupplierCertAppendId int       `xorm:"not null comment('增项信息表ID') INT(10)"`
 	SubClassId           int       `xorm:"not null comment('分类表主键（物资类或基建类或技术服务类）') INT(10)"`
+	SupplierTypeCode     string    `xorm:"not null default '' comment('分类标记') VARCHAR(10)"`
 	SortFlag             string    `xorm:"not null default '' comment('分类标记') VARCHAR(100)"`
 	Code                 string    `xorm:"not null default '' comment('分类编码') VARCHAR(50)"`
 	Name                 string    `xorm:"not null default '' comment('分类名称') VARCHAR(50)"`
@@ -22,3 +23,23 @@ type OilSupplierCertAppendSub struct {
 	ModifiedUserId       int       `xorm:"INT(10)"`
 	ModifiedBy           string    `xorm:"VARCHAR(50)"`
 }
+
+type  OilSub struct {
+	Id                   int       `xorm:"not null pk autoincr INT(10)"`
+	SupplierId           int       `xorm:"not null comment('供方基本信息表主键') INT(10)"`
+	SupplierCertId       int       `xorm:"not null comment('供方准入证书信息表主键') INT(10)"`
+	//SupplierCertAppendId int       `xorm:"not null comment('增项信息表ID') INT(10)"`
+	SupplierTypeCode string    `xorm:"not null default '' comment('准入类别代码') VARCHAR(5)"`
+	SubClassId           int       `xorm:"not null comment('分类表主键（物资类或基建类或技术服务类）') INT(10)"`
+	//SortFlag             string    `xorm:"not null default '' comment('分类标记') VARCHAR(100)"`
+	Code                 string    `xorm:"not null default '' comment('分类编码') VARCHAR(50)"`
+	Name                 string    `xorm:"not null default '' comment('分类名称') VARCHAR(50)"`
+	Remark               string    `xorm:"comment('备注') VARCHAR(500)"`
+	IsDelete             int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
+	CreateOn             time.Time `xorm:"DATETIME"`
+	CreateUserId         int       `xorm:"INT(10)"`
+	CreateBy             string    `xorm:"VARCHAR(50)"`
+	ModifiedOn           time.Time `xorm:"DATETIME"`
+	ModifiedUserId       int       `xorm:"INT(10)"`
+	ModifiedBy           string    `xorm:"VARCHAR(50)"`
+}

src/dashoo.cn/backend/api/business/oilsupplier/suppliercertsub/oilsuppliercertsub.go

@@ -5,21 +5,24 @@ import (
 )
 
 type OilSupplierCertSub struct {
-	Id               int       `xorm:<- not null pk autoincr INT(10)"`
-	SupplierId       int       `xorm:"not null comment('供方基本信息表主键') INT(10)"`
-	SupplierCertId   int       `xorm:"not null comment('供方准入证书信息表主键') INT(10)"`
-	SupplierTypeCode string    `xorm:"not null default '' comment('准入类别代码') VARCHAR(5)"`
-	SubClassId       int       `xorm:"not null comment('分类表主键（物资类或基建类或技术服务类）') INT(10)"`
-	Code             string    `xorm:"not null default '' comment('分类编码') VARCHAR(8)"`
-	Name             string    `xorm:"not null default '' comment('分类名称') VARCHAR(50)"`
-	Remark           string    `xorm:"comment('备注') VARCHAR(500)"`
-	IsDelete         int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
-	CreateOn         time.Time `xorm:"DATETIME created"`
-	CreateUserId     int       `xorm:"INT(10)"`
-	CreateBy         string    `xorm:"VARCHAR(50)"`
-	ModifiedOn       time.Time `xorm:"DATETIME"`
-	ModifiedUserId   int       `xorm:"INT(10)"`
-	ModifiedBy       string    `xorm:"VARCHAR(50)"`
+	Id                   int       `xorm:<- not null pk autoincr INT(10)"`
+	SupplierId           int       `xorm:"not null comment('供方基本信息表主键') INT(10)"`
+	SupplierCertId       int       `xorm:"not null comment('供方准入证书信息表主键') INT(10)"`
+	SupplierCertAppendId int       `xorm:"not null comment('增项信息表ID') INT(10)"`
+	SupplierTypeCode     string    `xorm:"not null default '' comment('准入类别代码') VARCHAR(5)"`
+	SubClassId           int       `xorm:"not null comment('分类表主键（物资类或基建类或技术服务类）') INT(10)"`
+	Code                 string    `xorm:"not null default '' comment('分类编码') VARCHAR(8)"`
+	AppendStatus         string    `xorm:"not null default '' comment('增项审核状态') VARCHAR(10)"`
+	Type                 string    `xorm:"not null default '' comment('类型') VARCHAR(10)"`
+	Name                 string    `xorm:"not null default '' comment('分类名称') VARCHAR(50)"`
+	Remark               string    `xorm:"comment('备注') VARCHAR(500)"`
+	IsDelete             int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
+	CreateOn             time.Time `xorm:"DATETIME created"`
+	CreateUserId         int       `xorm:"INT(10)"`
+	CreateBy             string    `xorm:"VARCHAR(50)"`
+	ModifiedOn           time.Time `xorm:"DATETIME"`
+	ModifiedUserId       int       `xorm:"INT(10)"`
+	ModifiedBy           string    `xorm:"VARCHAR(50)"`
 }
 type goodsChecked struct {
 	Id       string `json:"id"`

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

@@ -2,6 +2,7 @@ package oilsupplier
 
 import (
 	"dashoo.cn/backend/api/business/audithistory"
+	"dashoo.cn/backend/api/business/oilsupplier/suppliercertsub"
 	"dashoo.cn/business2/userRole"
 	"encoding/json"
 	"strconv"
@@ -162,24 +163,36 @@ func (this *OilSupplierCertAppendController) GetSupplier() {
 // @Success	200	{object} controllers.Request
 // @router /addappend [post]
 func (this *OilSupplierCertAppendController) AddAppend() {
-	var model suppliercertappend.OilSupplierCertAppend
+	var errinfo DataEntryInfo
 	var jsonblob = this.Ctx.Input.RequestBody
-
+	var cermodel suppliercert.OilSupplierCert
+	var model suppliercertappend.OilSupplierCertAppend
 	json.Unmarshal(jsonblob, &model)
-
+	where := " Id = "+ utils.ToStr(model.SupplierCertId)+ " and SupplierTypeCode = "+ model.AppendType
+	svc := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
+	svc.GetEntityByWhere(OilSupplierCertName, where, &cermodel)
+	//if cermodel.Status != "8" {
+	//	errinfo.Message = "入库后才能提交增项！"
+	//	errinfo.Code = -1
+	//	this.Data["json"] = &errinfo
+	//	this.ServeJSON()
+	//	return
+	//}
+	//添加增项信息
 	model.ApplyDate = time.Now() //申请日期
 	model.CreateOn = time.Now()
 	model.CreateBy = this.User.Realname
 	model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
-
-	svc := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
 	_, err := svc.InsertEntityBytbl(OilSupplierCertAppendName, &model)
-
-	var errinfo ErrorDataInfo
+	//查询准入范围
+	var certsublist []suppliercertsub.OilSupplierCertSub
+	suwhere := " SupplierCertId = "+ utils.ToStr(model.SupplierCertId)+ " and SupplierTypeCode = "+ model.AppendType
+	svc.GetEntitysByWhere(OilSupplierCertSubName, suwhere, &certsublist)
 	if err == nil {
 		errinfo.Message = "操作成功！"
 		errinfo.Code = 0
-		errinfo.Item = model.Id
+		errinfo.Item = certsublist
+		errinfo.Info = model.Id
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
 	} else {

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

@@ -1,6 +1,7 @@
 package oilsupplier
 
 import (
+	"dashoo.cn/backend/api/business/oilsupplier/suppliercertsub"
 	"encoding/json"
 	"time"
 
@@ -20,34 +21,32 @@ type OilSupplierCertAppendSubController struct {
 func (this *OilSupplierCertAppendSubController) GetList() {
 
 	//获取分页信息
-	page := this.GetPageInfoForm()
-	where := " 1=1 "
-	orderby := "Id"
-	asc := false
-	Order := this.GetString("Order")
-	Prop := this.GetString("Prop")
-	if Order != "" && Prop != "" {
-		orderby = Prop
-		if Order == "asc" {
-			asc = true
-		}
-	}
-
-	SupplierCertAppendId := this.GetString("SupplierCertAppendId")
-
-	if SupplierCertAppendId != "" {
-		where = where + " and SupplierCertAppendId = " + SupplierCertAppendId
-	}
-
+	//page := this.GetPageInfoForm()
+	//where := " 1=1 "
+	//orderby := "Id"
+	//asc := false
+	//Order := this.GetString("Order")
+	//Prop := this.GetString("Prop")
+	//if Order != "" && Prop != "" {
+	//	orderby = Prop
+	//	if Order == "asc" {
+	//		asc = true
+	//	}
+	//}
+
+	//SupplierCertAppendId := this.GetString("SupplierCertAppendId")
+	//if SupplierCertAppendId != "" {
+	//	where = where + " and SupplierCertAppendId = " + SupplierCertAppendId
+	//}
+	SupplierCertId := this.GetString("SupCertId")
+	SupplierTypeCode := this.GetString("SupTypeCode")
+	suwhere := " SupplierCertId = "+ SupplierCertId+ " and SupplierTypeCode = "+ SupplierTypeCode
 	svc := suppliercertappendsub.GetOilSupplierCertAppendSubService(utils.DBE)
-	var list []suppliercertappendsub.OilSupplierCertAppendSub
-	total := svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, where)
-
-	var datainfo DataInfo
-	datainfo.Items = list
-	datainfo.CurrentItemCount = total
-	datainfo.PageIndex = page.CurrentPage
-	datainfo.ItemsPerPage = page.Size
+	var list []suppliercertsub.OilSupplierCertSub
+	//svc.GetEntitysByWhere(OilSupplierCertAppendSubName, where, &list)
+	svc.GetEntitysByOrderbyWhere(OilSupplierCertSubName, suwhere,"CreateOn asc", &list)
+	var datainfo ErrorDataInfo
+	datainfo.Item = list
 	this.Data["json"] = &datainfo
 	this.ServeJSON()
 }
@@ -57,18 +56,18 @@ func (this *OilSupplierCertAppendSubController) GetList() {
 // @Success	200	{object} controllers.Request
 // @router /addappendsub [post]
 func (this *OilSupplierCertAppendSubController) AddAppendSub() {
-	var model suppliercertappendsub.OilSupplierCertAppendSub
+	var model suppliercertsub.OilSupplierCertSub
 	var jsonblob = this.Ctx.Input.RequestBody
 	var errinfo ErrorDataInfo
 
 	json.Unmarshal(jsonblob, &model)
-
+	model.Type = "2"
 	model.CreateOn = time.Now()
 	model.CreateBy = this.User.Realname
 	model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 
 	svc := suppliercertappendsub.GetOilSupplierCertAppendSubService(utils.DBE)
-	_, err := svc.InsertEntityBytbl(OilSupplierCertAppendSubName, &model)
+	_, err := svc.InsertEntityBytbl(OilSupplierCertSubName, &model)
 	if err == nil {
 		errinfo.Message = "操作成功！"
 		errinfo.Code = 0

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

@@ -117,7 +117,7 @@ func (this *OilSupplierCertSubController) GetEntityList() {
 			where = where + " and CreateOn>='" + minDate + "' and CreateOn<='" + maxDate + "'"
 		}
 	}
-
+	where = where + " and Type = '1'"
 	svc := suppliercertsub.GetOilSupplierCertSubService(utils.DBE)
 	var list []suppliercertsub.OilSupplierCertSub
 	total := svc.GetPagingEntitiesWithoutAccCode(page.CurrentPage, page.Size, orderby, asc, &list, where)

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

@@ -11,6 +11,17 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
+          <el-popover>
+            <el-steps :active="formData.Step" direction="vertical" align-center finish-status="success">
+              <el-step title="填信息"></el-step>
+              <el-step title="待审批"></el-step>
+              <el-step title="已审批"></el-step>
+              <el-step title="待交费"></el-step>
+              <el-step title="待入库"></el-step>
+              <el-step title="完成"></el-step>
+            </el-steps>
+            <el-button slot="reference" plain size="mini" style="margin-right: 8px">查看进度</el-button>
+          </el-popover>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
             v-if="auditBtn && this.formData.Status != '6'">{{auditTitle}}</el-button>
@@ -20,25 +31,17 @@
         </span>
       </div>
       <div>
-        <el-steps :active="formData.Step" simple align-center finish-status="success">
-          <el-step title="填信息"></el-step>
-          <el-step title="待审批"></el-step>
-          <el-step title="已审批"></el-step>
-          <el-step title="待交费"></el-step>
-          <el-step title="待入库"></el-step>
-          <el-step title="完成"></el-step>
-        </el-steps>
         <el-card class="box-card">
           <div slot="header">
             <span><i class="icon icon-table2"></i> 增项信息</span>
           </div>
           <el-form label-width="150px" ref="EntityForm" :rules="appendRules" :model="formData" :disabled="true">
             <el-row>
-              <el-col :span="12">
+              <!-- <el-col :span="12">
                 <el-form-item label="推荐单位名称" prop="RecUnitName">
                   <el-input v-model="formData.RecUnitName" placeholder="请输入推荐单位名称"></el-input>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
               <el-col :span="12">
                 <el-form-item label="供应方公司名称" prop="checkSelectedSupplier">
                   <el-select v-model="supplierOptions" filterable placeholder="请选择供应方公司" style="width: 100%">

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

@@ -11,6 +11,17 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
+          <el-popover>
+            <el-steps :active="formData.Step" direction="vertical" align-center finish-status="success">
+              <el-step title="填信息"></el-step>
+              <el-step title="待审批"></el-step>
+              <el-step title="已审批"></el-step>
+              <el-step title="待交费"></el-step>
+              <el-step title="待入库"></el-step>
+              <el-step title="完成"></el-step>
+            </el-steps>
+            <el-button slot="reference" plain size="mini" style="margin-right: 8px">查看进度</el-button>
+          </el-popover>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
             v-if="auditBtn && this.formData.Status != '6'">{{auditTitle}}</el-button>
@@ -20,25 +31,17 @@
         </span>
       </div>
       <div>
-        <el-steps :active="formData.Step" simple align-center finish-status="success">
-          <el-step title="填信息"></el-step>
-          <el-step title="待审批"></el-step>
-          <el-step title="已审批"></el-step>
-          <el-step title="待交费"></el-step>
-          <el-step title="待入库"></el-step>
-          <el-step title="完成"></el-step>
-        </el-steps>
         <el-card class="box-card">
           <div slot="header">
             <span><i class="icon icon-table2"></i> 增项信息</span>
           </div>
           <el-form label-width="150px" ref="EntityForm" :rules="appendRules" :model="formData" :disabled="true">
             <el-row>
-              <el-col :span="12">
+              <!-- <el-col :span="12">
                 <el-form-item label="推荐单位名称" prop="RecUnitName">
                   <el-input v-model="formData.RecUnitName" placeholder="请输入推荐单位名称"></el-input>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
               <el-col :span="12">
                 <el-form-item label="供应方公司名称" prop="checkSelectedSupplier">
                   <el-select v-model="supplierOptions" filterable placeholder="请选择供应方公司" style="width: 100%">

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

@@ -11,6 +11,17 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
+          <el-popover>
+            <el-steps :active="formData.Step" direction="vertical" align-center finish-status="success">
+              <el-step title="填信息"></el-step>
+              <el-step title="待审批"></el-step>
+              <el-step title="已审批"></el-step>
+              <el-step title="待交费"></el-step>
+              <el-step title="待入库"></el-step>
+              <el-step title="完成"></el-step>
+            </el-steps>
+            <el-button slot="reference" plain size="mini" style="margin-right: 8px">查看进度</el-button>
+          </el-popover>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
             v-if="auditBtn && this.formData.Status != '6'">{{auditTitle}}</el-button>
@@ -20,25 +31,17 @@
         </span>
       </div>
       <div>
-        <el-steps :active="formData.Step" simple align-center finish-status="success">
-          <el-step title="填信息"></el-step>
-          <el-step title="待审批"></el-step>
-          <el-step title="已审批"></el-step>
-          <el-step title="待交费"></el-step>
-          <el-step title="待入库"></el-step>
-          <el-step title="完成"></el-step>
-        </el-steps>
         <el-card class="box-card">
           <div slot="header">
             <span><i class="icon icon-table2"></i> 增项信息</span>
           </div>
           <el-form label-width="150px" ref="EntityForm" :rules="appendRules" :model="formData" :disabled="true">
             <el-row>
-              <el-col :span="12">
+              <!-- <el-col :span="12">
                 <el-form-item label="推荐单位名称" prop="RecUnitName">
                   <el-input v-model="formData.RecUnitName" placeholder="请输入推荐单位名称"></el-input>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
               <el-col :span="12">
                 <el-form-item label="供应方公司名称" prop="checkSelectedSupplier">
                   <el-select v-model="supplierOptions" filterable placeholder="请选择供应方公司" style="width: 100%">

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

@@ -11,8 +11,19 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
+          <el-popover>
+            <el-steps :active="formData.Step" direction="vertical" align-center finish-status="success">
+              <el-step title="填信息"></el-step>
+              <el-step title="待审批"></el-step>
+              <el-step title="已审批"></el-step>
+              <el-step title="待交费"></el-step>
+              <el-step title="待入库"></el-step>
+              <el-step title="完成"></el-step>
+            </el-steps>
+            <el-button slot="reference" plain size="mini" style="margin-right: 8px">查看进度</el-button>
+          </el-popover>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button>
-          <el-button type="primary" size="mini" style="margin-right: 3px" @click="AuditdialogShow = true"
+          <el-button type="primary" size="mini" style="margin-right: 8px" @click="AuditdialogShow = true"
             v-if="formData.Id !='' && (formData.Status == '0'||formData.Status == '')">提交审批
           </el-button>
           <router-link :to="'/oilsupplier/supplierappend/basislist'">
@@ -21,14 +32,6 @@
         </span>
       </div>
       <div>
-        <el-steps :active="formData.Step" simple align-center finish-status="success">
-          <el-step title="填信息"></el-step>
-          <el-step title="待审批"></el-step>
-          <el-step title="已审批"></el-step>
-          <el-step title="待交费"></el-step>
-          <el-step title="待入库"></el-step>
-          <el-step title="完成"></el-step>
-        </el-steps>
         <el-card class="box-card">
           <div slot="header">
             <span><i class="icon icon-table2"></i> 增项信息</span>
@@ -36,15 +39,7 @@
           </div>
           <el-form label-width="150px" ref="EntityForm" :rules="appendRules" :model="formData">
             <el-row>
-              <el-col :span="12">
-                <el-form-item label="推荐单位名称" prop="checkSelectedRecUnitName">
-                  <el-cascader ref="tjdwCascader" :options="organizeTreeList" :props="organizeTreeProps"
-                    change-on-select :show-all-levels="false" v-model="selectedOrgList" @change="getCode2"
-                    placeholder="请选择推荐单位" style="width: 100%">
-                  </el-cascader>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item label="供应方公司名称" prop="checkSelectedSupplier">
                   <el-select v-model="supplierOptions" filterable @change="getInfo" placeholder="请选择供应方公司"
                     style="width: 100%">
@@ -54,7 +49,7 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="24">
+              <el-col :span="16">
                 <el-form-item label="备注" prop="Remark">
                   <el-input type="textarea" v-model="formData.Remark" placeholder="请输入"></el-input>
                 </el-form-item>
@@ -68,27 +63,91 @@
             <span><i class="icon icon-table2"></i> 增项分类</span>
             <el-button style="float: right; padding: 3px 0" type="text" @click="addSortData()">添加</el-button>
           </div>
-          <el-table :data="entityList" border height="calc(100vh - 345px)" style="width: 100%" @sort-change="orderby">
+          <el-table :data="entityList" border style="width: 100%" @sort-change="orderby">
             <el-table-column label="操作" min-width="100" align="center" fixed>
               <template slot-scope="scope">
-                <el-button type="primary" title="编辑" size="mini" plain @click="editSortData(scope.row)">打开</el-button>
-                <el-button type="primary" title="删除" size="mini" plain @click="deleteData(scope.row.Id)">删除</el-button>
+                <el-button type="primary" title="删除" size="mini" plain @click="deleteData(scope.row.Id)"
+                  :disabled="scope.row.SupplierTypeCode != ''">删除</el-button>
               </template>
             </el-table-column>
-            <el-table-column prop="SortFlag" label="分类标记" v-if="1==2" show-overflow-tooltip></el-table-column>
+            <!-- <el-table-column prop="SortFlag" label="分类标记" v-if="1==2" show-overflow-tooltip></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="Remark" label="备注" show-overflow-tooltip></el-table-column>
           </el-table>
-          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+          <!-- <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-pagination> -->
+        </el-card>
+        <el-card class="box-card" style="margin-top: 10px;">
+          <div slot="header" class="clearfix">
+            <span style="font-weight: bold"> 企业资质</span>
+          </div>
+          <el-table :data="subfileList" border>
+            <el-table-column label="操作" width="150" align="center" fixed>
+              <template slot-scope="scope">
+                <el-button type="primary" plain size="mini" title="编辑" @click="openDialog(scope.row)"
+                  :disabled="editbtn">编辑
+                </el-button>
+              </template>
+            </el-table-column>
+            <el-table-column prop="NeedFileType" label="资质名称" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="FileUrlList" label="资质文件" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <div v-for="(tmpUrl, index) in scope.row.FileUrlList">
+                  <a :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank"
+                    class="buttonText">{{scope.row.FileName.split('$')[index]}}</a>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="EffectDate" label="有效日期" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ jstimehandle(scope.row.EffectDate+'') }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="OtherRemark" label="描述" show-overflow-tooltip></el-table-column>
+          </el-table>
         </el-card>
       </div>
     </el-card>
+    <el-dialog title="编辑文件" :visible.sync="visible" top="5vh">
+      <el-form :model="SubfileForm" label-width="100px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="资质名称" required>
+              <el-input v-model="SubfileForm.NeedFileType" placeholder="请输文件类型" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="有效日期" required>
+              <el-date-picker style="width: 100%" v-model="SubfileForm.EffectDate" type="date" placeholder="请选择有效日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="描述">
+              <el-input v-model="SubfileForm.OtherRemark" type="textarea" :rows=3 placeholder="请输入备注信息"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="资质文件">
+              <el-upload multiple style="margin-top: 10px;" action="" ref="refuploadattach"
+                :http-request="uploadrequest" class="attach-uploader" :before-upload="beforeAvatarUpload">
+                <i class="el-icon-plus attach-uploader-icon"></i>
+                <div slot="tip" class="el-upload__tip">大小为512KB-5MB</div>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer" style="margin-top:-30px;">
+        <el-button @click="visible = false">取 消</el-button>
+        <el-button type="primary" @click="makesure()">确 定</el-button>
+      </div>
+    </el-dialog>
     <!-- 增项分类添加、修改 -->
-    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible">
+    <el-dialog title="添加" :visible.sync="dialogVisible">
       <el-form label-width="150px" ref="dialogFormData" :rules="sortEntityFormRules" :model="dialogFormData">
         <el-row>
           <el-col :span="12">
@@ -145,11 +204,11 @@
       </el-pagination>
     </el-dialog>
 
-     <el-dialog title="审批历史" :visible.sync="audithistoryshow" width="1200px">
+    <el-dialog title="审批历史" :visible.sync="audithistoryshow" width="1200px">
       <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
     </el-dialog>
 
-   <el-dialog title="提交初审" :visible.sync="AuditdialogShow" width="520px">
+    <el-dialog title="提交初审" :visible.sync="AuditdialogShow" width="520px">
       <el-form ref="searchForm" label-width="70px">
         <el-row>
           <!--<el-col :span="24">
@@ -203,7 +262,7 @@
   export default {
     components: {
       WfBackHistory,
-      ChooseAuditor
+      ChooseAuditor,
     },
     computed: {
       ...mapGetters({
@@ -228,6 +287,7 @@
         }
       }
       return {
+        auditbusList: [],
         audithistoryshow: false,
         chooseAuditorVisible: false,
         orgtreelist: [], //二级单位
@@ -244,6 +304,33 @@
           classId: '02',
           workflowId: ''
         },
+        SupplierId: 0,
+        SupplierTypeCode: '',
+        SupplierCertId: 0,
+        subfileList: [],
+        visible: false,
+        dynamicTableColumns: [],
+        flag: '',
+        editbtn: true,
+        //资质文件
+        SubfileForm: {
+          Id: '',
+          SupplierId: '',
+          SupplierTypeCode: '',
+          SupplierCertSubId: '',
+          CertSubName: '',
+          NeedFileType: '',
+          NeedFileCode: '',
+          FileType: '',
+          FileExt: '',
+          FileName: '',
+          EffectDate: new Date(),
+          FileUrl: '',
+          OtherRemark: '',
+          Remark: '',
+          IsDelete: 0,
+          FileUrlList: [],
+        },
         auditform: {
           FirstAuditName: '',
           CertId: '',
@@ -274,6 +361,7 @@
         formData: {
           Id: '',
           Step: 1,
+          Type: '',
           Status: '',
           SupplierId: 0,
           SupplierCertId: 0,
@@ -284,14 +372,14 @@
           Remark: '', //备注
         },
         dialogVisible: false, //增项分类dialog
-        dialogTitle: '',
         dialogFormData: {
           Id: '',
           SupplierId: 0, //供方表ID
           SupplierCertId: 0, //供方证书表ID
           SupplierCertAppendId: '', //增项信息表ID
-          SubClassId: 2, //分类表主键（物资类或基建类或技术服务类）
-          SortFlag: '', //分类标记
+          SupplierTypeCode: '',
+          SubClassId: '', //分类表主键
+          // SortFlag: '', //分类标记
           Code: '', //分类编码
           Name: '', //分类名称
           Remark: '', //备注
@@ -309,11 +397,6 @@
         },
         //增项表单规则
         appendRules: {
-          checkSelectedRecUnitName: [{
-            required: true,
-            validator: CheckSelectedOption,
-            trigger: 'blur'
-          }],
           checkSelectedSupplier: [{
             required: true,
             validator: CheckSelectedOption3,
@@ -328,6 +411,7 @@
             trigger: 'blur'
           }],
         },
+        auditfileList: [], // 文档
         Id: '', //传的参数
         editFlag: '', //编辑操作标记
         basisDialog: false,
@@ -346,13 +430,13 @@
       if (this.editFlag == '1' && this.Id !== '') {
         this.getEntityById()
         this.dialogFormData.SupplierCertAppendId = this.Id
-        this.getSortList()
       }
       this.getOrgTreeList() //获取推荐单位层级列表
       this.getBasisList() //获取基建类层级列表
       this.getSupplierList() //获取供应方公司列表
       this.getDictOptions()
       this.getorgtreelist()
+
     },
     methods: {
 
@@ -362,16 +446,156 @@
         let params = {
           IsInnerOrganize: this.organizeform.IsInnerOrganize
         }
-        _this.$axios.get('organizes/list', {
+        _this.$axios.get('organizes/orgalllist', {
             params
           })
           .then(res => {
             _this.organizeTreeList = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
+            if (_this.authUser.Profile.IsCompanyUser === 0) {
+              this.selectedOrgList = _this.authUser.Profile.Superior.split(',').map((val) => {
+                return parseInt(val)
+              })
+            }
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+      //获取资质文件
+      getFileList() {
+        this.SupplierId = this.formData.SupplierId
+        this.SupplierTypeCode = this.formData.AppendType
+        let _this = this
+        const params = {
+          SupplierId: this.SupplierId,
+          SupplierTypeCode: this.SupplierTypeCode,
+          _currentPage: 1,
+          _size: 1000,
+        }
+        _this.$axios.get('supplierfile/filelist', {
+            params
+          })
+          .then(res => {
+            _this.subfileList = res.data.items
+            _this.currentItemCount = res.data.currentItemCount
+            for (let idx in _this.subfileList) {
+              console.log(_this.subfileList[idx])
+              _this.subfileList[idx].FileUrlList = _this.subfileList[idx].FileUrl.split('$')
+
+            }
           })
           .catch(err => {
             console.error(err)
           })
       },
+      fileurlcut(val, index) {
+        let fileurlall = val.split('$')[index]
+        let fileurl = fileurlall.split("|")
+        return fileurl[0]
+      },
+      openDialog(val) {
+        this.SubfileForm.Id = val.Id
+        this.SubfileForm.SupplierId = val.SupplierId
+        this.SubfileForm.SupplierTypeCode = val.SupplierTypeCode
+        if (val.SupplierCertSubId == 0) {
+          this.SubfileForm.SupplierCertSubId = ''
+        } else {
+          this.SubfileForm.SupplierCertSubId = val.SupplierCertSubId
+        }
+        this.SubfileForm.CertSubName = val.CertSubName
+        this.SubfileForm.NeedFileType = val.NeedFileType
+        this.SubfileForm.NeedFileCode = val.NeedFileCode
+        this.SubfileForm.FileExt = val.FileExt
+        this.SubfileForm.FileType = val.FileType
+        this.SubfileForm.FileName = val.FileName
+        this.SubfileForm.EffectDate = new Date(val.EffectDate)
+        this.SubfileForm.FileUrl = val.FileUrl
+        this.getwendanginfo(val.FileUrl)
+        this.SubfileForm.OtherRemark = val.OtherRemark
+        this.SubfileForm.Remark = val.Remark
+        this.SubfileForm.IsDelete = val.IsDelete
+        this.visible = true
+      },
+      //文档列表
+      getwendanginfo(iUrl) {
+        let _this = this
+        _this.doclist = []
+        let exArr = iUrl.split('|')
+        let params = {
+          name: exArr[1],
+          url: exArr[0]
+        }
+        _this.doclist.push(params)
+      },
+      beforeAvatarUpload(file) {
+        /*let isLt512K = file.size / 1024 < 512
+        if (isLt512K) {
+          this.$message.error('上传文件大小不能小于 512KB!')
+          return false
+        }*/
+        let isLt50m = file.size / 1024 / 1024 / 5 < 1
+        if (!isLt50m) {
+          this.$message.error('上传文件大小不能超过 5MB!')
+          return false
+        }
+        return true
+      },
+      uploadrequest(option) {
+        let _this = this
+        axios.post(process.env.upfilehost, {})
+          .then(function (res) {
+            if (res.data && res.data.fid && res.data.fid !== '') {
+              option.action = `http://${res.data.url}/${res.data.fid}`
+              _this.waituploads.push({
+                uid: option.file.uid,
+                url: res.data.publicUrl,
+                fid: res.data.fid
+              })
+              uploadajax(option)
+            } else {
+              _this.$message({
+                type: 'warning',
+                message: '未上传成功！请刷新界面重新上传！'
+              })
+            }
+          })
+          .catch(function (error) {
+            _this.$message({
+              type: 'warning',
+              message: '未上传成功！请重新上传！'
+            })
+          })
+      },
+      // 判断附件是否上传成功
+      attachissuccess() {
+        if (this.$refs.refuploadattach.uploadFiles && this.$refs.refuploadattach.uploadFiles.length > 0) {
+          for (let i = 0; i < this.$refs.refuploadattach.uploadFiles.length; i++) {
+            if (this.$refs.refuploadattach.uploadFiles[i].status !== 'success') {
+              return false
+            }
+          }
+        }
+        return true
+      },
+      getattachissuccess() {
+        this.SubfileForm.FileUrl = ''
+        if (this.$refs.refuploadattach.uploadFiles && this.$refs.refuploadattach.uploadFiles.length > 0) {
+          for (let i = 0; i < this.$refs.refuploadattach.uploadFiles.length; i++) {
+            if (this.$refs.refuploadattach.uploadFiles[i].status === 'success') {
+              for (let j = 0; j < this.waituploads.length; j++) {
+                if (this.waituploads[j].uid === this.$refs.refuploadattach.uploadFiles[i].uid) {
+                  this.SubfileForm.FileUrl +=
+                    `${this.waituploads[j].url}/${this.waituploads[j].fid}|${this.$refs.refuploadattach.uploadFiles[i].name}$`
+                  this.SubfileForm.FileName += `${this.$refs.refuploadattach.uploadFiles[i].name}$`
+                }
+              }
+            }
+          }
+        }
+      },
+      clickachment(url, uid) {
+        window.open(`http://${url}`)
+      },
 
       //获取供应方公司列表
       getSupplierList() {
@@ -407,6 +631,7 @@
 
       //选择具体的分类
       getChooseCode(val) {
+        this.dialogFormData.SubClassId = val.Id
         this.dialogFormData.SortFlag = val.Id.toString() //记录OilBasisBuild表的Id
         this.dialogFormData.Code = val.Code
         this.dialogFormData.Name = val.Name
@@ -445,19 +670,13 @@
         let _this = this
         api2.getEntityById(_this.Id, _this.$axios).then(res => {
           _this.formData = res.data
+          console.log("---this.formData---", _this.formData)
           this.backhistroy.certId = _this.Id
           this.backhistroy.workflowId = _this.formData.WorkFlowId
-          //显示原推荐单位
-          if (_this.formData.RecUnitFlag != null) {
-            let arr = _this.formData.RecUnitFlag.split(',')
-            let arr2 = []
-            for (let i = 0; i < arr.length; i++) {
-              arr2.push(parseInt(arr[i]))
-            }
-            _this.selectedOrgList = arr2
-          }
+          this.getFileList()
           //显示公司名
           _this.supplierOptions = _this.formData.SupplierId.toString()
+          _this.getSortList()
         }).catch(err => {
           console.error(err)
         })
@@ -468,8 +687,6 @@
         let _this = this
         this.$refs['EntityForm'].validate((valid) => {
           if (valid) {
-            let arr = _this.$refs['tjdwCascader'].currentLabels
-            _this.formData.RecUnitName = arr[arr.length - 1] //获取推荐单位名
             if (_this.editFlag == '1' && _this.Id !== '') {
               _this.updateData()
             } else {
@@ -505,16 +722,20 @@
       getSortList() {
         //分页及列表条件
         let params = {
-          _currentPage: this.currentPage,
-          _size: this.size,
-          Order: this.Column.Order,
-          Prop: this.Column.Prop,
+          // _currentPage: this.currentPage,
+          // _size: this.size,
+          // Order: this.Column.Order,
+          // Prop: this.Column.Prop,
           SupplierCertAppendId: this.dialogFormData.SupplierCertAppendId,
+          SupCertId: this.formData.SupplierCertId,
+          SupTypeCode: this.formData.AppendType,
         };
+
         //访问接口
         api.getList(params, this.$axios).then(res => {
-          this.entityList = res.data.items
-          this.currentItemCount = res.data.currentItemCount
+          this.entityList = res.data.item
+          console.log("------res.entityList==--", this.entityList)
+          // this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
           console.error(err)
         })
@@ -522,19 +743,19 @@
 
       //添加增项信息
       addAppend() {
-        let _this = this
-        _this.formData.AppendType = '02'
-        _this.$axios.post('/suppliercertappend/addappend/', _this.formData)
+        this.formData.AppendType = '02'
+        this.$axios.post('/suppliercertappend/addappend/', this.formData)
           .then(res => {
             if (res.data.code === 0) {
-              _this.dialogFormData.SupplierCertAppendId = res.data.item //接收插入数据后返回的Id
-              _this.Id = res.data.item
-              _this.$message({
+              this.entityList = res.data.item
+              this.dialogFormData.SupplierCertAppendId = res.data.info //接收插入数据后返回的Id
+              this.Id = res.data.info
+              this.$message({
                 type: 'success',
                 message: res.data.message,
               })
             } else {
-              _this.$message({
+              this.$message({
                 type: 'warning',
                 message: res.data.message
               })
@@ -550,24 +771,15 @@
         let _this = this
         //先判断是否保存了增项信息
         if (this.checkAppendSave()) {
-          _this.dialogTitle = '添加'
           _this.dialogVisible = true
           _this.dialogFormData.Id = ''
-          _this.dialogFormData.SortFlag = ''
+          // _this.dialogFormData.SortFlag = ''
           _this.dialogFormData.Code = ''
           _this.dialogFormData.Name = ''
           _this.dialogFormData.Remark = ''
         }
       },
 
-      //编辑增项分类
-      editSortData(row) {
-        let _this = this
-        _this.dialogTitle = '编辑'
-        _this.dialogVisible = true
-        _this.dialogFormData = row
-      },
-
       //取消
       cancelOption() {
         let _this = this
@@ -579,36 +791,10 @@
         this.$refs['dialogFormData'].validate((valid) => {
           if (valid) {
             let _this = this
-            if (_this.dialogTitle == '添加') {
-              _this.dialogFormData.SupplierId = _this.formData.SupplierId
-              _this.dialogFormData.SupplierCertId = _this.formData.SupplierCertId
-              _this.dialogFormData.SupplierCertAppendId = parseInt(_this.dialogFormData.SupplierCertAppendId)
-              _this.addSortAppend()
-              _this.getEntityById()
-            }
-            if (_this.dialogTitle == '编辑') {
-              let arr = []
-              api.updateEntity(_this.dialogFormData.Id, _this.dialogFormData, _this.$axios).then(res => {
-                if (res.data.code === 0) {
-                  this.$message({
-                    type: 'success',
-                    message: res.data.message
-                  });
-                  //关闭dialog
-                  _this.dialogVisible = false
-                  //更新列表
-                  this.getSortList()
-                  this.getEntityById()
-                } else {
-                  this.$message({
-                    type: 'warning',
-                    message: res.data.message
-                  });
-                }
-              }).catch(err => {
-                console.error(err)
-              })
-            }
+            _this.dialogFormData.SupplierId = _this.formData.SupplierId
+            _this.dialogFormData.SupplierCertId = _this.formData.SupplierCertId
+            _this.dialogFormData.SupplierCertAppendId = parseInt(_this.dialogFormData.SupplierCertAppendId)
+            _this.addSortAppend()
           } else {
             return false
           }
@@ -629,20 +815,19 @@
 
       //添加增项分类信息
       addSortAppend() {
-        let _this = this
-        _this.$axios.post('/suppliercertappendsub/addappendsub/', _this.dialogFormData)
+        this.dialogFormData.SupplierTypeCode = "02"
+        this.$axios.post('/suppliercertappendsub/addappendsub/', this.dialogFormData)
           .then(res => {
             if (res.data.code === 0) {
-              _this.$message({
+              this.$message({
                 type: 'success',
                 message: res.data.message,
               })
               //关闭dialog
-              _this.dialogVisible = false
-              //更新增项分类表
-              _this.getSortList()
+              this.getEntityById()
+              this.dialogVisible = false
             } else {
-              _this.$message({
+              this.$message({
                 type: 'warning',
                 message: res.data.message
               })
@@ -809,3 +994,32 @@
   }
 
 </script>
+<style lang='scss'>
+  .attach-uploader .el-upload {
+    border: 1px dashed #63B8FF;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+    // margin-bottom: -17px;
+    margin-top: -15px;
+    margin-left: 20px
+  }
+
+  .attach-uploader .el-upload:hover {
+    border-color: #228B22;
+  }
+
+  .attach-uploader-icon {
+    font-size: 25px;
+    color: #63B8FF;
+    width: 50px;
+    height: 50px;
+    line-height: 50px;
+    text-align: center;
+  }
+
+  .attach-uploader-icon:hover {
+    color: #228B22;
+  }
+
+</style>

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

@@ -11,8 +11,19 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
+          <el-popover>
+            <el-steps :active="formData.Step" direction="vertical" align-center finish-status="success">
+              <el-step title="填信息"></el-step>
+              <el-step title="待审批"></el-step>
+              <el-step title="已审批"></el-step>
+              <el-step title="待交费"></el-step>
+              <el-step title="待入库"></el-step>
+              <el-step title="完成"></el-step>
+            </el-steps>
+            <el-button slot="reference" plain size="mini" style="margin-right: 8px">查看进度</el-button>
+          </el-popover>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button>
-          <el-button type="primary" size="mini" style="margin-right: 3px" @click="AuditdialogShow = true"
+          <el-button type="primary" size="mini" style="margin-right: 8px" @click="AuditdialogShow = true"
             v-if="formData.Id !='' && (formData.Status == '0'||formData.Status == '')">提交审批
           </el-button>
           <router-link :to="'/oilsupplier/supplierappend/goodslist'">
@@ -21,14 +32,6 @@
         </span>
       </div>
       <div>
-        <el-steps :active="formData.Step" simple align-center finish-status="success">
-          <el-step title="填信息"></el-step>
-          <el-step title="待审批"></el-step>
-          <el-step title="已审批"></el-step>
-          <el-step title="待交费"></el-step>
-          <el-step title="待入库"></el-step>
-          <el-step title="完成"></el-step>
-        </el-steps>
         <el-card class="box-card" style="margin-top: 20px">
           <div slot="header">
             <span><i class="icon icon-table2"></i> 增项信息</span>
@@ -36,14 +39,14 @@
           </div>
           <el-form label-width="150px" ref="EntityForm" :rules="appendRules" :model="formData">
             <el-row>
-              <el-col :span="12">
+              <!-- <el-col :span="12">
                 <el-form-item label="推荐单位名称" prop="checkSelectedRecUnitName">
                   <el-cascader ref="tjdwCascader" :options="organizeTreeList" :props="organizeTreeProps"
                     change-on-select :show-all-levels="false" v-model="selectedOrgList" @change="getCode2"
                     placeholder="请选择推荐单位" style="width: 100%">
                   </el-cascader>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
               <el-col :span="12">
                 <el-form-item label="供应方公司名称" prop="checkSelectedSupplier">
                   <el-select v-model="supplierOptions" filterable @change="getInfo" placeholder="请选择供应方公司"
@@ -348,11 +351,16 @@
         let params = {
           IsInnerOrganize: this.organizeform.IsInnerOrganize
         }
-        _this.$axios.get('organizes/list', {
+        _this.$axios.get('organizes/orgalllist', {
             params
           })
           .then(res => {
             _this.organizeTreeList = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
+            if (_this.authUser.Profile.IsCompanyUser === 0) {
+              this.selectedOrgList = _this.authUser.Profile.Superior.split(',').map((val) => {
+                return parseInt(val)
+              })
+            }
           })
           .catch(err => {
             console.error(err)
@@ -491,8 +499,6 @@
         let _this = this
         this.$refs['EntityForm'].validate((valid) => {
           if (valid) {
-            let arr = _this.$refs['tjdwCascader'].currentLabels
-            _this.formData.RecUnitName = arr[arr.length - 1] //获取推荐单位名
             if (_this.editFlag == '1' && _this.Id !== '') {
               _this.updateData()
             } else {

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

@@ -11,8 +11,19 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
+          <el-popover>
+            <el-steps :active="formData.Step" direction="vertical" align-center finish-status="success">
+              <el-step title="填信息"></el-step>
+              <el-step title="待审批"></el-step>
+              <el-step title="已审批"></el-step>
+              <el-step title="待交费"></el-step>
+              <el-step title="待入库"></el-step>
+              <el-step title="完成"></el-step>
+            </el-steps>
+            <el-button slot="reference" plain size="mini" style="margin-right: 8px">查看进度</el-button>
+          </el-popover>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button>
-          <el-button type="primary" size="mini" style="margin-right: 3px" @click="AuditdialogShow = true"
+          <el-button type="primary" size="mini" style="margin-right: 8px" @click="AuditdialogShow = true"
             v-if="formData.Id !='' && (formData.Status == '0'||formData.Status == '')">提交审批
           </el-button>
           <router-link :to="'/oilsupplier/supplierappend/techlist'">
@@ -21,14 +32,6 @@
         </span>
       </div>
       <div>
-        <el-steps :active="formData.Step" simple align-center finish-status="success">
-          <el-step title="填信息"></el-step>
-          <el-step title="待审批"></el-step>
-          <el-step title="已审批"></el-step>
-          <el-step title="待交费"></el-step>
-          <el-step title="待入库"></el-step>
-          <el-step title="完成"></el-step>
-        </el-steps>
         <el-card class="box-card">
           <div slot="header">
             <span><i class="icon icon-table2"></i> 增项信息</span>
@@ -36,14 +39,14 @@
           </div>
           <el-form label-width="150px" ref="EntityForm" :rules="appendRules" :model="formData">
             <el-row>
-              <el-col :span="12">
+              <!-- <el-col :span="12">
                 <el-form-item label="推荐单位名称" prop="checkSelectedRecUnitName">
                   <el-cascader ref="tjdwCascader" :options="organizeTreeList" :props="organizeTreeProps"
                     change-on-select :show-all-levels="false" v-model="selectedOrgList" @change="getCode2"
                     placeholder="请选择推荐单位" style="width: 100%">
                   </el-cascader>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
               <el-col :span="12">
                 <el-form-item label="供应方公司名称" prop="checkSelectedSupplier">
                   <el-select v-model="supplierOptions" filterable @change="getInfo" placeholder="请选择供应方公司"
@@ -348,11 +351,16 @@
         let params = {
           IsInnerOrganize: this.organizeform.IsInnerOrganize
         }
-        _this.$axios.get('organizes/list', {
+        _this.$axios.get('organizes/orgalllist', {
             params
           })
           .then(res => {
             _this.organizeTreeList = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
+            if (_this.authUser.Profile.IsCompanyUser === 0) {
+              this.selectedOrgList = _this.authUser.Profile.Superior.split(',').map((val) => {
+                return parseInt(val)
+              })
+            }
           })
           .catch(err => {
             console.error(err)
@@ -450,8 +458,6 @@
         let _this = this
         this.$refs['EntityForm'].validate((valid) => {
           if (valid) {
-            let arr = _this.$refs['tjdwCascader'].currentLabels
-            _this.formData.RecUnitName = arr[arr.length - 1] //获取推荐单位名
             if (_this.editFlag == '1' && _this.Id !== '') {
               _this.updateData()
             } else {