物资类添加业务、文件

src/dashoo.cn/backend/api/business/oilsupplier/goodsaptitude/oilgoodsaptitude.go

@@ -6,7 +6,7 @@ import (
 
 type OilGoodsAptitude struct {
 	Id                int       `xorm:"not null pk autoincr INT(10)"`
-	ClassId           int	    `xorm:"not null default '' comment('编码') INT(11)"`
+	ClassId           int       `xorm:"not null default '' comment('编码') INT(11)"`
 	GoodsLevel        string    `xorm:"default '' comment('物资级别') VARCHAR(8)"`
 	GoodsDesc         string    `xorm:"default '' comment('产品说明') VARCHAR(50)"`
 	Standard          string    `xorm:"default '' comment('标准备案') VARCHAR(8)"`
@@ -68,16 +68,24 @@ type OilGoodsAptitude struct {
 }
 
 type OilGoodsAptitudeView struct {
-	Code         string    `xorm:"default '' VARCHAR(50) 'code'"`
-	Name         string    `xorm:"default '' VARCHAR(50) 'name'"`
-	Code1         string    `xorm:"default '' VARCHAR(50) 'code1'"`
-	Name1         string    `xorm:"default '' VARCHAR(50) 'name1'"`
-	Code2         string    `xorm:"default '' VARCHAR(50) 'code2'"`
-	Name2         string    `xorm:"default '' VARCHAR(50) 'name2'"`
-	Code3         string    `xorm:"default '' VARCHAR(50) 'code3'"`
-	Name3         string    `xorm:"default '' VARCHAR(50) 'name3'"`
-	Code4         string    `xorm:"default '' VARCHAR(50) 'code4'"`
-	Name4         string    `xorm:"default '' VARCHAR(50) 'name4'"`
+	Code             string `xorm:"default '' VARCHAR(50) 'code'"`
+	Name             string `xorm:"default '' VARCHAR(50) 'name'"`
+	Code1            string `xorm:"default '' VARCHAR(50) 'code1'"`
+	Name1            string `xorm:"default '' VARCHAR(50) 'name1'"`
+	Code2            string `xorm:"default '' VARCHAR(50) 'code2'"`
+	Name2            string `xorm:"default '' VARCHAR(50) 'name2'"`
+	Code3            string `xorm:"default '' VARCHAR(50) 'code3'"`
+	Name3            string `xorm:"default '' VARCHAR(50) 'name3'"`
+	Code4            string `xorm:"default '' VARCHAR(50) 'code4'"`
+	Name4            string `xorm:"default '' VARCHAR(50) 'name4'"`
 	OilGoodsAptitude `xorm:"extends"`
 }
 
+type GoodsBusiness struct {
+	Id                int
+	Code              string
+	Name              string
+	ParentId          int
+	Remark            string
+	DeletionStateCode int
+}

src/dashoo.cn/backend/api/business/oilsupplier/supplierfile/supplierfile.go

@@ -6,6 +6,7 @@ import (
 
 type OilSupplierFile struct {
 	Id                int       `xorm:"not null pk autoincr INT(10)"`
+	SupplierCertId    int       `xorm:"INT(10)"`
 	AppendClassId     int       `xorm:"INT(10)"`
 	SupplierCertSubId int       `xorm:"INT(10)"`
 	NeedFileType      string    `xorm:"VARCHAR(50)"`

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

@@ -2,6 +2,7 @@ package oilsupplier
 
 import (
 	"encoding/json"
+
 	"time"
 
 	"dashoo.cn/backend/api/business/baseUser"
@@ -35,7 +36,6 @@ func (this *OilGoodsAptitudeController) GetEntityList() {
 		}
 	}
 
-
 	svc := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
 	var list []goodsaptitude.OilGoodsAptitudeView
 	total := svc.GetMyPagingEntitiesWithOrderBytbl(OilGoodsAptDetailViewName, page.CurrentPage, page.Size, orderby, asc, &list, where)
@@ -324,3 +324,37 @@ func (this *OilGoodsAptitudeController) DeleteEntity() {
 		this.ServeJSON()
 	}
 }
+
+// @Title get 业务列表
+// @Description get SampleType by token
+// @Success 200 {object} sampletype.SampleType
+// @router /goodsparentlist [get]
+func (this *OilGoodsAptitudeController) GoodsParentList() {
+	svc := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
+	where := " ParentId = 0 "
+	var list []goodsaptitude.GoodsBusiness
+	svc.GetEntitysByWhere(OilGoodsAptitudeClassName, where, &list)
+	var datainfo DataInfo
+	datainfo.Items = list
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
+
+// @Title get 业务列表
+// @Description get SampleType by token
+// @Success 200 {object} sampletype.SampleType
+// @router /goodschildlist [get]
+func (this *OilGoodsAptitudeController) GoodsChildList() {
+	ParentId := this.GetString("ParentId")
+	svc := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
+	where := " 1 = 1 "
+	if ParentId != "" {
+		where = where + " and ParentId = '" + ParentId + "'"
+	}
+	var list []goodsaptitude.GoodsBusiness
+	svc.GetEntitysByWhere(OilGoodsAptitudeClassName, where, &list)
+	var datainfo DataInfo
+	datainfo.Items = list
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}

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

@@ -58,7 +58,7 @@ func (this *OilSupplierCertSubController) GetEntityList() {
 	}
 
 	if SupplierCertId != "" {
-		where = where + " and SupplierCertId like '%" + SupplierCertId + "%'"
+		where = where + " and SupplierCertId = '" + SupplierCertId + "'"
 	}
 
 	if SubClassId != "" {

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

@@ -35,6 +35,10 @@ func (this *SupplierfileController) FileList() {
 			asc = true
 		}
 	}
+	SupplierCertId := this.GetString("SupplierCertId")
+	if SupplierCertId != "" {
+		where = where + " and SupplierCertId = '" + SupplierCertId + "'"
+	}
 	SupplierCertSubId := this.GetString("SupplierCertSubId")
 	if SupplierCertSubId != "" {
 		where = where + " and SupplierCertSubId in (" + SupplierCertSubId + ")"

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

@@ -346,7 +346,7 @@ func (this *OilTechnologyServiceController) DeleteEntity() {
 	}
 }
 
-// @Title get
+// @Title get 业务列表
 // @Description get SampleType by token
 // @Success 200 {object} sampletype.SampleType
 // @router /businesslist [get]

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

@@ -30,14 +30,31 @@
         <span style="font-weight: bold">分类文档</span>
         <el-button style="float: right; padding: 3px 0" type="text" @click="subfiledialog">添加</el-button>
       </div>
-      <subfile-list ref="subfileList" :data="subfileList" :SupplierCertSubId="cersubId" :businessList="businessList"
-        height="360px" style="margin-top: 20px"></subfile-list>
+      <subfile-list ref="subfileList" :data="subfileList" :SupplierCertId="SupplierCertId" :SupplierCertSubId="cersubId"
+        :businessList="businessList" height="360px" style="margin-top: 20px"></subfile-list>
     </el-card>
 
     <el-dialog :title="Title" :visible.sync="visible" top="5vh">
       <el-form :model="BusinessForm" label-width="100px">
         <el-row>
-          <el-col :span="12">
+          <el-col :span="12" v-if="SubClassId == '1'">
+            <el-form-item label="名称" required>
+              <el-select filterable default-first-option v-model="OneCode" placeholder="请选择" style="width: 100%"
+                @change="getChild()">
+                <el-option v-for="item in oneList" :key="item.Id" :label="item.Name" :value="item.Id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="SubClassId == '3'">
+            <el-form-item label="名称" required>
+              <el-input placeholder="请选择名称" v-model="BusinessForm.Code" style="width:100%">
+                <el-button type="primary" style="width:30%" @click="basicDialog = true" slot="append">选择
+                </el-button>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="SubClassId != '3'">
             <el-form-item label="名称" required>
               <el-cascader :options="techTreeList" :props="orgtreeprops" change-on-select :show-all-levels="false"
                 v-model="selectedorg" placeholder="请选择菜单" @change="getCode()" style="width:100%"></el-cascader>
@@ -60,6 +77,39 @@
         <el-button type="primary" @click="savedata()">确 定</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog title="基建类业务列表" :visible.sync="basicDialog" top="5vh" style="width：1000px">
+      <span style="float: right;">
+        <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="seachdata()">查询
+        </el-button>
+        <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="basicDialog = false">
+          取消</el-button>
+      </span>
+      <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+        <el-form-item label="业务名称">
+          <el-input size="mini" style="width: 165px;" v-model="keyword" placeholder="请输入业务名称"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-table :data="businessList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column label="操作" width="70" align="center" fixed>
+          <template slot-scope="scope">
+            <el-button type="text" title="编辑" size="small" icon="el-icon-edit" @click="openDialog(scope.row)">
+            </el-button>
+            <el-button size="small" type="text" style="margin-left:3px" icon="el-icon-delete" title="删除"
+              @click="deletedata(scope.row)"></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="Remark" label="备注" show-overflow-tooltip></el-table-column>
+      </el-table>
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+        :total="currentItemCount">
+      </el-pagination>
+
+    </el-dialog>
   </div>
 </template>
 
@@ -90,7 +140,6 @@
     },
     created() {
       this.initData()
-      this.getbusiness()
     },
     computed: {
       ...mapGetters({
@@ -99,6 +148,8 @@
     },
     data() {
       return {
+        oneList: [],
+        OneCode: '',
         businessList: [],
         techList: [],
         techTreeList: [],
@@ -125,6 +176,7 @@
         currentPage: 1, // 分页
         size: 10,
         currentItemCount: 0,
+        basicDialog: false,
 
         cersubId: '', //对应的证书分类ID
         subfileList: [], //文档
@@ -148,7 +200,7 @@
             _this.businessList = res.data.items
             _this.currentItemCount = res.data.currentItemCount
             if (_this.businessList && _this.businessList.length > 0) {
-              for(var i = 0; i < _this.businessList.length; i ++){
+              for (var i = 0; i < _this.businessList.length; i++) {
                 _this.selectId.push(_this.businessList[i].Id)
               }
               _this.cersubId = _this.selectId.join(",")
@@ -160,26 +212,6 @@
             console.error(err)
           })
       },
-      getbusiness() {
-        let _this = this
-        this.$axios.get('technologyservice/businesslist', {})
-          .then(res => {
-            _this.techList = res.data.items
-            _this.techTreeList = window.toolfun_gettreejson(res.data.items, 'Id', 'ParentId', 'Id,Name')
-          })
-          .catch(err => {
-            // handle error
-            console.error(err)
-          })
-      },
-      getCode() {
-        for (var i = 0; i < this.techList.length; i++) {
-          if (this.selectedorg[this.selectedorg.length - 1] == this.techList[i].Id) {
-            this.BusinessForm.Name = this.techList[i].Name
-            this.BusinessForm.Code = this.techList[i].Code
-          }
-        }
-      },
       savedata() {
         if (this.Title == '新增准入范围') {
           this.addBusiness()
@@ -269,6 +301,7 @@
       },
       showDialog() {
         this.Title = '新增准入范围'
+        this.BusinessForm.Id = ''
         this.BusinessForm.SupplierId = this.SupplierId
         this.BusinessForm.SupplierCertId = this.SupplierCertId
         this.BusinessForm.SubClassId = this.SubClassId
@@ -276,6 +309,7 @@
         this.BusinessForm.Name = ''
         this.BusinessForm.Remark = ''
         this.BusinessForm.IsDelete = 0
+        this.getbusiness()
         this.visible = true
       },
       openDialog(val) {
@@ -288,8 +322,74 @@
         this.BusinessForm.Name = val.Name
         this.BusinessForm.Remark = val.Remark
         this.BusinessForm.IsDelete = val.IsDelete
+        this.getbusiness()
         this.visible = true
       },
+      getbusiness() {
+        let _this = this
+        if (_this.SubClassId == '1') { //获取物资类业务列表
+          this.$axios.get('goodsaptitude/goodsparentlist', {})
+            .then(res => {
+              _this.oneList = res.data.items
+              if (_this.Title == '编辑准入范围') {
+                for (var i = 0; i < _this.oneList.length; i++) {
+                  if (_this.BusinessForm.Code == _this.oneList[i].Code) {
+                    _this.OneCode = _this.oneList[i].Id
+                  }
+                }
+              }
+            })
+            .catch(err => {
+              console.error(err)
+            })
+        } else if (_this.SubClassId == '2') { //获取技术服务类业务列表
+          this.$axios.get('technologyservice/businesslist', {})
+            .then(res => {
+              _this.techList = res.data.items
+              _this.techTreeList = window.toolfun_gettreejson(res.data.items, 'Id', 'ParentId', 'Id,Name')
+            })
+            .catch(err => {
+              // handle error
+              console.error(err)
+            })
+        } else {}
+      },
+      getCode() {
+        for (var i = 0; i < this.techList.length; i++) {
+          if (this.selectedorg[this.selectedorg.length - 1] == this.techList[i].Id) {
+            this.BusinessForm.Name = this.techList[i].Name
+            this.BusinessForm.Code = this.techList[i].Code
+          }
+        }
+      },
+      getChild() {
+        const params = {
+          ParentId: this.OneCode
+        }
+        this.$axios.get('goodsaptitude/goodschildlist', {
+            params
+          })
+          .then(res => {
+            this.techList = res.data.items
+            if (this.techList && this.techList.length > 0) {
+              this.techTreeList = window.toolfun_gettreejson(res.data.items, 'Id', 'ParentId', 'Id,Name')
+            } else {
+              this.getParentCode()
+            }
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
+      getParentCode() {
+        for (var i = 0; i < this.oneList.length; i++) {
+          if (this.OneCode == this.oneList[i].Id) {
+            this.BusinessForm.Name = this.oneList[i].Name
+            this.BusinessForm.Code = this.oneList[i].Code
+          }
+        }
+      },
 
       handleSelectionChange(val) {
         this.selectBusiness = val
@@ -309,9 +409,6 @@
         this.$refs["subfileList"].initData(this.cersubId)
       },
 
-      seachdata() {
-        this.initData()
-      },
       handleSizeChange(value) {
         this.size = value
         this.currentPage = 1

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

@@ -30,7 +30,7 @@
             <el-form-item label="文件分类" required>
               <el-select ref="refSupplierCertSub" v-model="SubfileForm.SupplierCertSubId" style="width:100%"
                 placeholder="请选择文件分类" @change="getCode()">
-                <el-option v-for="item in businessList" :label="item.Name" :value="item.Id" :key="item.Code">
+                <el-option v-for="item in businessList" :label="item.Name" :value="item.Id" :key="item.Id">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -86,7 +86,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top:-30px;">
         <el-button @click="visible = false">取 消</el-button>
-        <el-button type="primary" @click="savedata()">确 定</el-button>
+        <el-button type="primary" @click="makesure()">确 定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -102,6 +102,10 @@
   export default {
     name: 'SubfileList',
     props: {
+      SupplierCertId: {
+        type: String,
+        default: '0'
+      },
       SupplierCertSubId: {
         type: String,
         default: '0'
@@ -132,6 +136,7 @@
         Title: '',
         SubfileForm: {
           Id: '',
+          SupplierCertId: '',
           AppendClassId: '',
           SupplierCertSubId: '',
           NeedFileType: '',
@@ -158,6 +163,7 @@
       initData(val) {
         let _this = this
         const params = {
+          SupplierCertId: this.SupplierCertId,
           SupplierCertSubId: val,
           _currentPage: this.currentPage,
           _size: this.size,
@@ -184,23 +190,43 @@
           }
         }
       },
-      savedata() {
-        if (this.$refs.refuploadattach.uploadFiles && this.$refs.refuploadattach.uploadFiles.length > 0) {
-          // 上传附件是否完成判断
-          if (!this.attachissuccess()) {
-            this.$message.error('有附件未成功上传！不能保存数据')
-            return
-          }
-          this.getattachissuccess()
-          if (this.Title == '新增文件') {
+      makesure() {
+        if (this.Title == '新增文件') {
+          if (this.$refs.refuploadattach.uploadFiles && this.$refs.refuploadattach.uploadFiles.length > 0) {
+            // 上传附件是否完成判断
+            if (!this.attachissuccess()) {
+              this.$message.error('有附件未成功上传！不能保存数据')
+              return
+            }
+            this.getattachissuccess()
             this.addSubfile()
-          } else if (this.Title == '编辑文件') {
-            this.editSubfile()
+          } else {
+            this.$message({
+              type: 'warning',
+              message: '请上传文件！'
+            })
           }
+        } else if (this.Title == '编辑文件')
+          if (this.$refs.refuploadattach.uploadFiles && this.$refs.refuploadattach.uploadFiles.length > 0) {
+            // 上传附件是否完成判断
+            if (!this.attachissuccess()) {
+              this.$message.error('有附件未成功上传！不能保存数据')
+              return
+            }
+            this.getattachissuccess()
+            this.editSubfile()
+          } else if (this.doclist && this.doclist.length > 0) {
+          this.editSubfile()
+        } else {
+          this.$message({
+            type: 'warning',
+            message: '请上传文件！'
+          })
         }
       },
       addSubfile() {
         let _this = this
+        _this.SubfileForm.SupplierCertId = parseInt(_this.SubfileForm.SupplierCertId)
         _this.SubfileForm.AppendClassId = parseInt(_this.SubfileForm.AppendClassId)
         _this.$axios.post('/supplierfile/addsubfile/', _this.SubfileForm)
           .then(res => {
@@ -224,6 +250,7 @@
       },
       editSubfile() {
         let _this = this
+        _this.SubfileForm.SupplierCertId = parseInt(_this.SubfileForm.SupplierCertId)
         _this.SubfileForm.AppendClassId = parseInt(_this.SubfileForm.AppendClassId)
         _this.$axios.put('/supplierfile/editsubfile/' + _this.SubfileForm.Id, _this.SubfileForm)
           .then(res => {
@@ -278,6 +305,7 @@
       showDialog() {
         this.Title = '新增文件'
         this.SubfileForm.Id = ''
+        this.SubfileForm.SupplierCertId = this.SupplierCertId
         this.SubfileForm.AppendClassId = ''
         this.SubfileForm.SupplierCertSubId = ''
         this.SubfileForm.NeedFileType = ''
@@ -294,6 +322,7 @@
       openDialog(val) {
         this.Title = '编辑文件'
         this.SubfileForm.Id = val.Id
+        this.SubfileForm.SupplierCertId = val.SupplierCertId
         this.SubfileForm.AppendClassId = val.AppendClassId
         this.SubfileForm.SupplierCertSubId = val.SupplierCertSubId
         this.SubfileForm.NeedFileType = val.NeedFileType
@@ -301,6 +330,7 @@
         this.SubfileForm.FileExt = val.FileExt
         this.SubfileForm.FileSize = val.FileSize
         this.SubfileForm.EffectDate = new Date(val.EffectDate)
+        this.SubfileForm.FileUrl = val.FileUrl
         this.SubfileForm.OtherRemark = val.OtherRemark
         if (val.FileUrl != '') {
           this.getwendanginfo(val.FileUrl)

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

@@ -343,7 +343,7 @@
             <div slot="header" class="clearfix">
               <span>企业人员结构情况</span>
               <span style="float: right;">
-                <el-button type="primary" size="mini" @click="updateEntityNumber">保存人员结构情况</el-button>
+                <el-button type="primary" size="mini" @click="updateNumberEntity">保存人员结构情况</el-button>
               </span>
             </div>
 
@@ -460,226 +460,10 @@
             </winning-list>
           </el-card>
         </el-tab-pane>
-        <!--<el-tab-pane label="推荐信息">
-          <el-form label-width="130px" ref="EntityForm" :model="formData">
-            <el-row>
-              &lt;!&ndash;<el-col :span="8">
-                <el-form-item label="DEMO">
-                  <el-select ref="selectWellNo" v-model="formData.WellNoId" filterable placeholder="请选择" style="width: 100%">
-                    <el-option
-                      v-for="item in wellNoOptions"
-                      :key="item.Id"
-                      :label="item.Value"
-                      :value="item.Id">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>&ndash;&gt;
-
-              <el-col :span="8">
-                <el-form-item label="准入证号">
-                  <el-input v-model="formData.AccessCardNo" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="准入类别">
-                  <el-input v-model="formData.SupplierTypeCode" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="推荐单位">
-                  <el-input v-model="formData.RecUnitId" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              &lt;!&ndash;<el-col :span="8">
-                <el-form-item label="推荐单位名称">
-                  <el-input v-model="formData.RecUnitName" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>&ndash;&gt;
-
-              <el-col :span="8">
-                <el-form-item label="推荐单位负责人">
-                  <el-input v-model="formData.RecUnitPerson" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="推荐日期">
-                  <el-input v-model="formData.RecDate" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="推荐意见">
-                  <el-input v-model="formData.RecUnitReason" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="状态"> &lt;!&ndash;(0未申请，1办理完毕)&ndash;&gt;
-                  <el-input v-model="formData.Status" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="退回原因">
-                  <el-input v-model="formData.BackReason" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="准入标识">
-                  <el-input v-model="formData.InFlag" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="有效期起">
-                  <el-input v-model="formData.EffectStartTime" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="有效期止">
-                  <el-input v-model="formData.EffectEndTime" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="办理过程备注">
-                  <el-input v-model="formData.AuditProcessNote" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="审核日期">
-                  <el-input v-model="formData.AuditDate" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
 
-              <el-col :span="8">
-                <el-form-item label="交费通知">
-                  <el-input v-model="formData.PayNotice" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="供应商状态"> &lt;!&ndash;（null:正常，1中止，2终止）&ndash;&gt;
-                  <el-input v-model="formData.SupplierStatus" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="供应商管理类型">
-                  <el-input v-model="formData.MgrType" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="供应商类型">
-                  <el-input v-model="formData.Type" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="管理单位">
-                  <el-input v-model="formData.MgrUnit" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="准入日期">
-                  <el-input v-model="formData.AddinTime" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="生效日期">
-                  <el-input v-model="formData.EffectTime" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="年审到期日期">
-                  <el-input v-model="formData.ApplyTime" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="供应商准入证编号">
-                  <el-input v-model="formData.SupplierNo" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="MDM标志">
-                  <el-input v-model="formData.MDMFlag" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="国内采购">
-                  <el-input v-model="formData.InternalFlag" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="进口采购">
-                  <el-input v-model="formData.ImportFlag" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="境外项目">
-                  <el-input v-model="formData.OutsideFlog" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="备注">
-                  <el-input v-model="formData.Remark" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-            </el-row>
-          </el-form>
-        </el-tab-pane>-->
-        <el-tab-pane label="申请准入范围">
-          <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-            <el-table-column label="操作" min-width="100" align="center" fixed>
-              <template slot-scope="scope">
-                <router-link :to="'/oilsupplier/oilsuppliercertsub/' + scope.row.Id + '/operation'">
-                  <el-button type="text" title="编辑" size="small" icon="el-icon-edit"></el-button>
-                </router-link>
-
-                <el-popover placement="top" title="提示" v-model="scope.row.deleteConfirmFlag">
-                  <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="text" title="删除" style="margin-left:3px" size="small"
-                    @click="scope.row.deleteConfirmFlag = true">
-                    <i class="el-icon-delete"></i>
-                  </el-button>
-                </el-popover>
-              </template>
-            </el-table-column>
-
-            <el-table-column v-for="column in tableColumns" :key="column.Id" v-if="column.prop != 'CreateOn'"
-              :prop="column.prop" sortable min-width="100" :label="column.label" align="center" show-overflow-tooltip>
-            </el-table-column>
-
-            <!--<el-table-column prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
-              <template slot-scope="scope">
-                {{ jstimehandle(scope.row.CreateOn+'') }}
-              </template>
-            </el-table-column>-->
-          </el-table>
+        <el-tab-pane label="选择准入范围" :disabled="formData.Step < 2">
+          <business-list ref="businessList" :data="businessList" :SupplierCertId="certId" :SupplierId="serviceId"
+            :SubClassId="classId" height="360px" style="margin-top: 20px"></business-list>
         </el-tab-pane>
 
         <el-tab-pane label="审批流程">
@@ -702,12 +486,15 @@
   import PerformanceList from '../../../../components/oilsupplier/performancelist'
   import PatentList from '../../../../components/oilsupplier/patentlist'
   import WinningList from '../../../../components/oilsupplier/winninglist'
+  import BusinessList from '../../../../components/oilsupplier/businesslist'
+
   export default {
     components: {
       EquipmentList, //企业主要装备情况
       PerformanceList, //近三年主要工程业绩列表
       PatentList, //拥有专利、专有技术及工法列表
       WinningList, //近三年获得省部级及以上主要技术、管理成果、获奖项目列表
+      BusinessList, //选择准入范围
     },
     computed: {
       ...mapGetters({
@@ -722,9 +509,13 @@
         performanceList: [], //近三年主要工程业绩       
         patentList: [], //拥有专利、专有技术及工法      
         winningList: [], //近三年获得省部级及以上主要技术、管理成果、获奖项目
+        businessList: [], //准入业务
 
         serviceId: '',
+        certId: '',
+        classId: '3',
         stepActive: 0,
+
         formData: {
           Id: '',
           SupplierName: '',
@@ -945,7 +736,30 @@
       next() {
         if (this.stepActive++ > 5) this.stepActive = 5;
       },
-
+      //企业人员结构情况
+      updateNumberEntity() {
+        // if (!this.CheckCompanyBase()) {
+        //   return false
+        // }
+        // api.updateNumberEntity(this.formData.Id + '_' + this.certId, this.formDataCert, this.$axios).then(res => {
+        //   if (res.data.code === 0) {
+        //     //保存成功后，初始化数据，变成修改
+        //     this.initDatas()
+        //     this.$message({
+        //       type: 'success',
+        //       message: res.data.message
+        //     });
+
+        //   } else {
+        //     this.$message({
+        //       type: 'warning',
+        //       message: res.data.message
+        //     });
+        //   }
+        // }).catch(err => {
+        //   console.error(err)
+        // });
+      },
       jstimehandle(val) {
         if (val === '') {
           return '----'

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

@@ -320,7 +320,7 @@
             <div slot="header" class="clearfix">
               <span>企业人员结构情况</span>
               <span style="float: right;">
-                <el-button type="primary" size="mini" @click="updateEntityNumber">保存人员结构情况</el-button>
+                <el-button type="primary" size="mini" @click="updateNumberEntity">保存人员结构情况</el-button>
               </span>
             </div>
 
@@ -438,226 +438,9 @@
           </el-card>
         </el-tab-pane>
 
-        <!--<el-tab-pane label="推荐信息">
-          <el-form label-width="130px" ref="EntityForm" :model="formData">
-            <el-row>
-              &lt;!&ndash;<el-col :span="8">
-                <el-form-item label="DEMO">
-                  <el-select ref="selectWellNo" v-model="formData.WellNoId" filterable placeholder="请选择" style="width: 100%">
-                    <el-option
-                      v-for="item in wellNoOptions"
-                      :key="item.Id"
-                      :label="item.Value"
-                      :value="item.Id">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>&ndash;&gt;
-
-              <el-col :span="8">
-                <el-form-item label="准入证号">
-                  <el-input v-model="formData.AccessCardNo" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="准入类别">
-                  <el-input v-model="formData.SupplierTypeCode" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="推荐单位">
-                  <el-input v-model="formData.RecUnitId" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              &lt;!&ndash;<el-col :span="8">
-                <el-form-item label="推荐单位名称">
-                  <el-input v-model="formData.RecUnitName" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>&ndash;&gt;
-
-              <el-col :span="8">
-                <el-form-item label="推荐单位负责人">
-                  <el-input v-model="formData.RecUnitPerson" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="推荐日期">
-                  <el-input v-model="formData.RecDate" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="推荐意见">
-                  <el-input v-model="formData.RecUnitReason" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="状态"> &lt;!&ndash;(0未申请，1办理完毕)&ndash;&gt;
-                  <el-input v-model="formData.Status" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="退回原因">
-                  <el-input v-model="formData.BackReason" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="准入标识">
-                  <el-input v-model="formData.InFlag" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="有效期起">
-                  <el-input v-model="formData.EffectStartTime" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="有效期止">
-                  <el-input v-model="formData.EffectEndTime" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="办理过程备注">
-                  <el-input v-model="formData.AuditProcessNote" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="审核日期">
-                  <el-input v-model="formData.AuditDate" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="交费通知">
-                  <el-input v-model="formData.PayNotice" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="供应商状态"> &lt;!&ndash;（null:正常，1中止，2终止）&ndash;&gt;
-                  <el-input v-model="formData.SupplierStatus" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="供应商管理类型">
-                  <el-input v-model="formData.MgrType" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="供应商类型">
-                  <el-input v-model="formData.Type" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="管理单位">
-                  <el-input v-model="formData.MgrUnit" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="准入日期">
-                  <el-input v-model="formData.AddinTime" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="生效日期">
-                  <el-input v-model="formData.EffectTime" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="年审到期日期">
-                  <el-input v-model="formData.ApplyTime" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="供应商准入证编号">
-                  <el-input v-model="formData.SupplierNo" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="MDM标志">
-                  <el-input v-model="formData.MDMFlag" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="国内采购">
-                  <el-input v-model="formData.InternalFlag" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="进口采购">
-                  <el-input v-model="formData.ImportFlag" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="境外项目">
-                  <el-input v-model="formData.OutsideFlog" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="备注">
-                  <el-input v-model="formData.Remark" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-            </el-row>
-          </el-form>
-        </el-tab-pane>-->
-        <el-tab-pane label="申请准入范围">
-          <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-            <el-table-column label="操作" min-width="100" align="center" fixed>
-              <template slot-scope="scope">
-                <router-link :to="'/oilsupplier/oilsuppliercertsub/' + scope.row.Id + '/operation'">
-                  <el-button type="text" title="编辑" size="small" icon="el-icon-edit"></el-button>
-                </router-link>
-
-                <el-popover placement="top" title="提示" v-model="scope.row.deleteConfirmFlag">
-                  <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="text" title="删除" style="margin-left:3px" size="small"
-                    @click="scope.row.deleteConfirmFlag = true">
-                    <i class="el-icon-delete"></i>
-                  </el-button>
-                </el-popover>
-              </template>
-            </el-table-column>
-
-            <el-table-column v-for="column in tableColumns" :key="column.Id" v-if="column.prop != 'CreateOn'"
-              :prop="column.prop" sortable min-width="100" :label="column.label" align="center" show-overflow-tooltip>
-            </el-table-column>
-
-            <!--<el-table-column prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
-              <template slot-scope="scope">
-                {{ jstimehandle(scope.row.CreateOn+'') }}
-              </template>
-            </el-table-column>-->
-          </el-table>
+        <el-tab-pane label="选择准入范围" :disabled="formData.Step < 2">
+          <business-list ref="businessList" :data="businessList" :SupplierCertId="certId" :SupplierId="serviceId"
+            :SubClassId="classId" height="360px" style="margin-top: 20px"></business-list>
         </el-tab-pane>
 
         <el-tab-pane label="审批流程">
@@ -680,12 +463,15 @@
   import PerformanceList from '../../../../components/oilsupplier/performancelist'
   import PatentList from '../../../../components/oilsupplier/patentlist'
   import WinningList from '../../../../components/oilsupplier/winninglist'
+  import BusinessList from '../../../../components/oilsupplier/businesslist'
+
   export default {
     components: {
       EquipmentList, //企业主要装备情况
       PerformanceList, //近三年主要工程业绩列表
       PatentList, //拥有专利、专有技术及工法列表
       WinningList, //近三年获得省部级及以上主要技术、管理成果、获奖项目列表
+      BusinessList, //选择准入范围
     },
     computed: {
       ...mapGetters({
@@ -700,9 +486,13 @@
         performanceList: [], //近三年主要工程业绩       
         patentList: [], //拥有专利、专有技术及工法      
         winningList: [], //近三年获得省部级及以上主要技术、管理成果、获奖项目
+        businessList: [], //准入业务
 
         serviceId: '',
+        certId: '',
+        classId: '1',
         stepActive: 0,
+
         formData: {
           Id: '',
           SupplierName: '',
@@ -777,40 +567,9 @@
 
         },
 
-        tableColumns: [{
-            prop: "SubClassId",
-            label: '分类名称',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Code",
-            label: '分类编码',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Name",
-            label: '分类名称',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Remark",
-            label: '备注',
-            width: 100,
-            sort: true
-          }
-
-        ]
-
         //下拉选择项
         //wellNoOptions: [],
         //supervisersOptions: [],
-
       }
     },
     created() {
@@ -924,7 +683,30 @@
       next() {
         if (this.stepActive++ > 5) this.stepActive = 5;
       },
-
+      //企业人员结构情况
+      updateNumberEntity() {
+        // if (!this.CheckCompanyBase()) {
+        //   return false
+        // }
+        // api.updateNumberEntity(this.formData.Id + '_' + this.certId, this.formDataCert, this.$axios).then(res => {
+        //   if (res.data.code === 0) {
+        //     //保存成功后，初始化数据，变成修改
+        //     this.initDatas()
+        //     this.$message({
+        //       type: 'success',
+        //       message: res.data.message
+        //     });
+
+        //   } else {
+        //     this.$message({
+        //       type: 'warning',
+        //       message: res.data.message
+        //     });
+        //   }
+        // }).catch(err => {
+        //   console.error(err)
+        // });
+      },
       jstimehandle(val) {
         if (val === '') {
           return '----'

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

@@ -349,9 +349,6 @@
 
         </el-tab-pane>
 
-        <!--<el-tab-pane label="推荐信息" >
-          <SupplierCertEdit ref="SupplierCertEditCompoment" :EntityId="1"></SupplierCertEdit>
-        </el-tab-pane>-->
         <el-tab-pane label="企业情况" :disabled="formData.Step < 1">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
@@ -510,7 +507,6 @@
   import PatentList from '../../../../components/oilsupplier/patentlist'
   import WinningList from '../../../../components/oilsupplier/winninglist'
   import BusinessList from '../../../../components/oilsupplier/businesslist'
-  import SubfileList from '../../../../components/oilsupplier/subfilelist'
 
   export default {
     components: {
@@ -523,7 +519,6 @@
       PatentList, //拥有专利、专有技术及工法列表
       WinningList, //近三年获得省部级及以上主要技术、管理成果、获奖项目列表
       BusinessList, //选择准入范围
-      SubfileList, //文档
     },
     computed: {
       ...mapGetters({
@@ -635,23 +630,6 @@
           business: '4',
           instance: '145001',
         },
-
-        tableColumns: [{
-          prop: "Code",
-          label: '分类编码',
-          width: 100,
-          sort: true
-        }, {
-          prop: "Name",
-          label: '分类名称',
-          width: 100,
-          sort: true
-        }, {
-          prop: "Remark",
-          label: '备注',
-          width: 100,
-          sort: true
-        }]
       }
     },
     created() {
@@ -804,7 +782,6 @@
               type: 'success',
               message: res.data.message
             });
-
           } else {
             this.$message({
               type: 'warning',