技术服务类新增功能

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

@@ -62,4 +62,4 @@ type OilSupplier struct {
 	ModifiedOn         time.Time `xorm:"DATETIME"`
 	ModifiedUserId     int       `xorm:"INT(10)"`
 	ModifiedBy         string    `xorm:"VARCHAR(50)"`
-}
+}

src/dashoo.cn/backend/api/business/oilsupplier/supplier/oilsupplierSession.go

@@ -0,0 +1,16 @@
+package supplier
+
+import (
+	. "dashoo.cn/backend/api/mydb"
+	"github.com/go-xorm/xorm"
+)
+
+type OilSupplierSession struct {
+	MySessionBase
+}
+
+func GetOilSupplierSession(session *xorm.Session) *OilSupplierSession {
+	s := new(OilSupplierSession)
+	s.Session = session
+	return s
+}

src/dashoo.cn/backend/api/business/oilsupplier/suppliercert/oilsuppliercert.go

@@ -44,3 +44,9 @@ type OilSupplierCert struct {
 	ModifiedUserId   int       `xorm:"INT(10)"`
 	ModifiedBy       string    `xorm:"VARCHAR(50)"`
 }
+
+type OilSupplierVM struct {
+	AccessCardNo     string
+	SupplierTypeCode string
+	SupplierTypeName string
+}

src/dashoo.cn/backend/api/business/oilsupplier/suppliercert/oilsuppliercertSession.go

@@ -0,0 +1,16 @@
+package suppliercert
+
+import (
+. "dashoo.cn/backend/api/mydb"
+"github.com/go-xorm/xorm"
+)
+
+type OilSupplierCertSession struct {
+	MySessionBase
+}
+
+func GetOilSupplierCertSession(session *xorm.Session) *OilSupplierCertSession {
+	s := new(OilSupplierCertSession)
+	s.Session = session
+	return s
+}

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

@@ -1,12 +1,14 @@
 package oilsupplier
 
 import (
+	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
 	"dashoo.cn/business/userRole"
 	"dashoo.cn/backend/api/business/baseUser"
 	"dashoo.cn/backend/api/business/oilsupplier/supplier"
 	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/utils"
 	"encoding/json"
+	"github.com/go-xorm/xorm"
 	"strings"
 	"time"
 )
@@ -347,11 +349,6 @@ func (this *OilSupplierController) GetEntityList() {
 	}
 
 
-	if CreateOn != "" {
-		where = where + " and CreateOn like '%" + CreateOn + "%'"
-	}
-
-
 	if CreateUserId != "" {
 		where = where + " and CreateUserId like '%" + CreateUserId + "%'"
 	}
@@ -388,7 +385,7 @@ func (this *OilSupplierController) GetEntityList() {
 
 	svc := supplier.GetOilSupplierService(utils.DBE)
 	var list []supplier.OilSupplier
-	total := svc.GetPagingEntitiesWithOrderBytbl(this.User.AccCode, page.CurrentPage, page.Size, orderby, asc, &list, where)
+	total := svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, where)
 	var datainfo DataInfo
 	datainfo.Items = list
 	datainfo.CurrentItemCount = total
@@ -444,8 +441,13 @@ func (this *OilSupplierController) GetEntity() {
 // @router /add [post]
 func (this *OilSupplierController) AddEntity() {
 	var model supplier.OilSupplier
+	var modelCert suppliercert.OilSupplierCert
+	var modelCertVM suppliercert.OilSupplierVM
 	var jsonBlob = this.Ctx.Input.RequestBody
-	svc := supplier.GetOilSupplierService(utils.DBE)
+	var session *xorm.Session
+	session = utils.DBE.NewSession()
+	svc := supplier.GetOilSupplierSession(session)
+	svcCert := suppliercert.GetOilSupplierCertSession(session)
 
 	json.Unmarshal(jsonBlob, &model)
 	model.CreateOn = time.Now()
@@ -453,7 +455,28 @@ func (this *OilSupplierController) AddEntity() {
 	model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 	//model.OrganizeId, _ = utils.StrTo(this.User.DepartmentId).Int()
 
-	_, err := svc.InsertEntityBytbl(OilSupplierName, &model)
+
+	defer session.Close()
+	err := session.Begin()
+	_, err = svc.InsertEntityBytbl(OilSupplierName, &model)
+	if err != nil {
+		session.Rollback()
+	}
+	modelCert.SupplierId = model.Id
+
+	json.Unmarshal(jsonBlob, &modelCertVM)
+	modelCert.SupplierTypeCode = modelCertVM.SupplierTypeCode
+	modelCert.SupplierTypeName = modelCertVM.SupplierTypeName
+	modelCert.CreateOn = time.Now()
+	modelCert.CreateBy = this.User.Realname
+	modelCert.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+	_, err = svcCert.InsertEntityBytbl(OilSupplierCertName, &modelCert)
+
+	if err != nil {
+		session.Rollback()
+	}
+	// add Commit() after all actions
+	err = session.Commit()
 
 	var errinfo ErrorDataInfo
 	if err == nil {

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

@@ -0,0 +1,41 @@
+export default {
+  getList(CreateOn, params, myAxios) {
+    return myAxios({
+      url: '/suppliercertappend/list?CreateOn='+ CreateOn,
+      method: 'GET',
+      params: params
+    });
+  },
+  getDictList(myAxios) {
+    return myAxios({
+      url: '/suppliercertappend/dictlist/',
+      method: 'GET'
+    });
+  },
+  getEntity(entityId, myAxios) {
+    return myAxios({
+      url: '/suppliercertappend/get/'+entityId,
+      method: 'GET',
+    })
+  },
+  addEntity(formData, myAxios) {
+    return myAxios({
+      url: '/suppliercertappend/add',
+      method: 'post',
+      data: formData
+    })
+  },
+  updateEntity(entityId, formData, myAxios) {
+    return myAxios({
+      url: '/suppliercertappend/update/'+entityId,
+      method: 'post',
+      data: formData
+    })
+  },
+  deleteEntity(entityId, myAxios) {
+    return myAxios({
+      url: '/suppliercertappend/delete/'+entityId,
+      method: 'delete'
+    })
+  },
+}

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

@@ -0,0 +1,41 @@
+export default {
+  getList(CreateOn, params, myAxios) {
+    return myAxios({
+      url: '/suppliercertappendsub/list?CreateOn='+ CreateOn,
+      method: 'GET',
+      params: params
+    });
+  },
+  getDictList(myAxios) {
+    return myAxios({
+      url: '/suppliercertappendsub/dictlist/',
+      method: 'GET'
+    });
+  },
+  getEntity(entityId, myAxios) {
+    return myAxios({
+      url: '/suppliercertappendsub/get/'+entityId,
+      method: 'GET',
+    })
+  },
+  addEntity(formData, myAxios) {
+    return myAxios({
+      url: '/suppliercertappendsub/add',
+      method: 'post',
+      data: formData
+    })
+  },
+  updateEntity(entityId, formData, myAxios) {
+    return myAxios({
+      url: '/suppliercertappendsub/update/'+entityId,
+      method: 'post',
+      data: formData
+    })
+  },
+  deleteEntity(entityId, myAxios) {
+    return myAxios({
+      url: '/suppliercertappendsub/delete/'+entityId,
+      method: 'delete'
+    })
+  },
+}

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

@@ -0,0 +1,43 @@
+
+
+export default {
+  getList(CreateOn, params, myAxios) {
+    return myAxios({
+      url: '/supplierfile/list?CreateOn='+ CreateOn,
+      method: 'GET',
+      params: params
+    });
+  },
+  getDictList(myAxios) {
+    return myAxios({
+      url: '/supplierfile/dictlist/',
+      method: 'GET'
+    });
+  },
+  getEntity(entityId, myAxios) {
+    return myAxios({
+      url: '/supplierfile/get/'+entityId,
+      method: 'GET',
+    })
+  },
+  addEntity(formData, myAxios) {
+    return myAxios({
+      url: '/supplierfile/add',
+      method: 'post',
+      data: formData
+    })
+  },
+  updateEntity(entityId, formData, myAxios) {
+    return myAxios({
+      url: '/supplierfile/update/'+entityId,
+      method: 'post',
+      data: formData
+    })
+  },
+  deleteEntity(entityId, myAxios) {
+    return myAxios({
+      url: '/supplierfile/delete/'+entityId,
+      method: 'delete'
+    })
+  },
+}

src/dashoo.cn/frontend_web/src/assets/styles/modules/global.scss

@@ -205,4 +205,4 @@ div.el-collapse-item__header, div.el-collapse-item__wrap {
   cursor:pointer;
   height:16px;
   width:16px;
-}
+}

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

@@ -0,0 +1,382 @@
+<template>
+  <div>
+    <el-form label-width="130px" ref="EntityForm" :model="formData">
+      <el-row>
+        <!--<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>-->
+
+        <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>-->
+
+        <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>
+
+        <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="状态"> <!--(0未申请，1办理完毕)-->
+            <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="供应商状态">  <!--（null:正常，1中止，2终止）-->
+            <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>
+  </div>
+</template>
+
+<script>
+  import {
+    mapGetters
+  } from 'vuex'
+  import api from '@/api/oilsupplier/suppliercert';
+  export default {
+    computed: {
+      ...mapGetters({
+        authUser: 'authUser'
+      })
+    },
+    name: 'oilsuppliercertEdit',
+    props: {
+      EntityId: Number
+    },
+
+    data () {
+      return {
+        serviceId: '',
+        formData: {
+          Id: '',
+          SupplierId: '',
+          AccessCardNo: '',
+          SupplierTypeCode: '',
+          SupplierTypeName: '',
+          RecUnitReason: '',
+          RecUnitPerson: '',
+          RecDate: '',
+          RecUnitId: '',
+          RecUnitName: '',
+          Status: '',
+          BackReason: '',
+          InFlag: '',
+          EffectStartTime: '',
+          EffectEndTime: '',
+          AuditProcessNote: '',
+          AuditDate: '',
+          PayNotice: '',
+          SupplierStatus: '',
+          MgrType: '',
+          Type: '',
+          MgrUnit: '',
+          AddinTime: '',
+          EffectTime: '',
+          ApplyTime: '',
+          SupplierNo: '',
+          MDMFlag: '',
+          InternalFlag: '',
+          ImportFlag: '',
+          OutsideFlog: '',
+          Remark: '',
+          IsDelete: '',
+          CreateOn: '',
+          CreateUserId: '',
+          CreateBy: '',
+          ModifiedOn: '',
+          ModifiedUserId: '',
+          ModifiedBy: '',
+
+        },
+
+        //下拉选择项
+        //wellNoOptions: [],
+        //supervisersOptions: [],
+
+      }
+    },
+    created() {
+      //this.serviceId = this.$route.params.opera;
+      this.serviceId = this.EntityId;
+      this.getDictOptions();
+      console.log(this.serviceId);
+      if(this.serviceId != 'add' && this.serviceId>0) {
+        this.formData.Id = this.serviceId;
+        this.initDatas();
+      } else {
+        this.formData.Id = 0;
+      }
+    },
+    methods: {
+      initDatas () {
+        if (this.formData.Id) {
+          api.getEntity(this.formData.Id, this.$axios).then(res => {
+            this.formData = res.data;
+          }).catch(err => {
+            console.error(err)
+          });
+        }
+      },
+
+      getDictOptions() {
+        api.getDictList(this.$axios).then(res => {
+          //this.wellNoOptions = res.data.items['WellNo']
+          //this.supervisersOptions = res.data.items['Supervisers']
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      //保存信息
+      saveEntity() {
+        this.$refs['EntityForm'].validate((valid) => {
+          if (valid) {
+            //this.formData.WellNo = this.$refs.selectWellNo.selectedLabel + '';
+
+            if (!this.formData.Id) {
+              this.addEntity();
+            } else {
+              this.updateEntity();
+            }
+
+          } else {
+            return false
+          }
+        })
+      },
+
+      addEntity() {
+        api.addEntity(this.formData, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            //保存成功后，初始化数据，变成修改
+            this.formData.Id = res.data.item
+            this.initDatas()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            });
+
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            });
+          }
+        }).catch(err => {
+          console.error(err)
+        });
+      },
+
+      updateEntity() {
+        api.updateEntity(this.formData.Id, this.formData, 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 '----'
+        } else if (val === '0001-01-01T08:00:00+08:00') {
+          return '----'
+        } else if (val === '5000-01-01T23:59:59+08:00') {
+          return '永久'
+        } else {
+          val = val.replace('T', ' ')
+          return val.substring(0, 10)
+        }
+      },
+
+      formatDateTime(date) {
+        var y = date.getFullYear();
+        var m = date.getMonth() + 1;
+        m = m < 10 ? ('0' + m) : m;
+        var d = date.getDate();
+        d = d < 10 ? ('0' + d) : d;
+        var h = date.getHours();
+        var minute = date.getMinutes();
+        minute = minute < 10 ? ('0' + minute) : minute;
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
+      }
+    }
+  }
+
+</script>
+
+<style lang="scss">
+
+</style>

src/dashoo.cn/frontend_web/src/components/workflow/wfhistory.vue

@@ -0,0 +1,175 @@
+<template>
+  <div>
+    <el-table :data="historyTask" border>
+      <el-table-column prop="taskName" sortable min-width="130" label="当前状态" align="center" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="remarks" sortable min-width="130" label="审批意见" align="center" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="assignee" sortable min-width="100" label="审核人" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span style="font-weight: bold" v-if="scope.row.assignee">
+            {{ assigneeToAssignee(scope.row.assignee) }}
+          </span>
+          <el-tooltip class="item" v-if="!scope.row.assignee" content="当前步骤有审批权限的人员" placement="top-start">
+            <span style="font-style: italic; color:#00F">
+              {{ assigneeToUsers(scope.row.users) }}
+            </span>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+      <el-table-column prop="startTime" sortable min-width="150" label="开始时间" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+          {{ timestampToTime(scope.row.startTime) }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="endTime" sortable min-width="150" label="结束时间" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+          {{ jstimehandle(timestampToTime(scope.row.endTime)) }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <div style="margin-top:-160px;">
+      <img :src="baseurl + 'limsdataentry/historyimg/' + entryinfo.instance " v-if="entryinfo.instance" style="width:850px">
+    </div>
+  </div>
+</template>
+
+<script>
+  import {
+    mapGetters
+  } from 'vuex'
+
+  export default {
+    name: 'wfhistory',
+    props: {
+      visible: {
+        type: Boolean,
+        default: false
+      },
+      entryinfo: {}
+    },
+    created() {
+      this.getuserlist()
+    },
+    computed: {
+      ...mapGetters({
+        session: 'session'
+      })
+    },
+    watch: {
+      visible(val) {
+        this.selfVisible = val
+        if (this.visible) {
+          this.getHistoryTask()
+        }
+      },
+      selfVisible(val) {
+        this.$emit('update:visible', val)
+      },
+    },
+    data() {
+      return {
+        baseurl: process.env.baseURL,
+        process: '',
+        business: '',
+        instance: '',
+        selfVisible: this.visible, // 避免vue双向绑定警告
+        historyTask: [],
+        userlist: [],
+      }
+    },
+    methods: {
+      getHistoryTask() {
+        let _this = this
+        const params = {
+          process: _this.entryinfo.process,
+          business: _this.entryinfo.business,
+          instance: _this.entryinfo.instance,
+        }
+        this.$axios.get('limsdataentry/historytask', {
+          params
+        })
+          .then(res => {
+            _this.historyTask = res.data.items
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
+      assigneeToAssignee(val) {
+        for (let i = 0; i < this.userlist.length; i++) {
+          if (val == this.userlist[i].Id) {
+            return this.userlist[i].Realname
+          }
+        }
+      },
+      assigneeToUsers(users) {
+        let userNames = ""
+        let userArr = users.split(',')
+        for(let idx=0; idx<userArr.length; idx++) {
+          let val = userArr[idx]
+          for (let i = 0; i < this.userlist.length; i++) {
+            if (parseInt(val) == parseInt(this.userlist[i].Id)) {
+              userNames += this.userlist[i].Realname + ", "
+            }
+          }
+        }
+        if(userNames.length > 0) {
+          userNames = userNames.substring(0, userNames.length-2)
+        }
+        return userNames;
+      },
+      getuserlist() {
+        let _this = this
+        _this.$axios.get('limsindex/userlist', {})
+          .then(res => {
+            // response
+            _this.userlist = res.data.items
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
+      timestampToTime(val) {
+        var date = new Date(val) //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        var Y = date.getFullYear() + '-'
+        var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'
+        var D = date.getDate() + ' '
+        var h = date.getHours() + ':'
+        var m = date.getMinutes() + ':'
+        var s = date.getSeconds()
+        return Y + M + D + h + m + s
+      },
+      jstimehandle(val) {
+        if (val === '') {
+          return '----'
+        } else if (val === '0001-01-01T08:00:00+08:00') {
+          return '----'
+        } else if (val === '5000-01-01T23:59:59+08:00') {
+          return '永久'
+        } else if (val === '1970-01-01 8:0:0') {
+          return '----'
+        } else if (val === '1970-01-1 8:0:0') {
+          return '----'
+        } else {
+          val = val.replace('T', ' ')
+          return val.substring(0, 19)
+        }
+      },
+    }
+  }
+
+</script>
+
+<style>
+  .samplerecoveope .el-radio {
+    padding: 8px 15px 0 0;
+    margin-left: -2px;
+  }
+  .dialog-footer img{
+    position: relative;
+    width: 100%;
+    height: 100%;
+  }
+
+</style>

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

@@ -18,7 +18,15 @@
         </span>
       </div>
 
-      <el-tabs tab-position="top">
+      <el-steps :active="stepActive" 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-steps>
+
+      <el-tabs tab-position="right" style="margin-top: 10px">
         <el-tab-pane label="企业基本信息">
           <el-form label-width="120px" ref="EntityForm" :model="formData">
             <el-row>
@@ -574,6 +582,7 @@
     data() {
       return {
         serviceId: '',
+        stepActive: 0,
         formData: {
           Id: '',
           SupplierName: '',
@@ -632,6 +641,8 @@
           ModifiedOn: '',
           ModifiedUserId: '',
           ModifiedBy: '',
+          SupplierTypeCode: '02',
+          SupplierTypeName: '基建类'
 
         },
 
@@ -764,6 +775,10 @@
         });
       },
 
+      next() {
+        if (this.stepActive++ > 5) this.stepActive = 5;
+      },
+
       jstimehandle(val) {
         if (val === '') {
           return '----'

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

@@ -18,7 +18,15 @@
         </span>
       </div>
 
-      <el-tabs tab-position="top">
+      <el-steps :active="stepActive" 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-steps>
+
+      <el-tabs tab-position="right" style="margin-top: 10px">
         <el-tab-pane label="企业基本信息">
           <el-form label-width="130px" ref="EntityForm" :model="formData">
             <el-row>
@@ -553,6 +561,7 @@
     data() {
       return {
         serviceId: '',
+        stepActive: 0,
         formData: {
           Id: '',
           SupplierName: '',
@@ -612,6 +621,9 @@
           ModifiedUserId: '',
           ModifiedBy: '',
 
+          SupplierTypeCode: '01',
+          SupplierTypeName: '物资类'
+
         },
 
         tableColumns: [
@@ -743,6 +755,10 @@
         });
       },
 
+      next() {
+        if (this.stepActive++ > 5) this.stepActive = 5;
+      },
+
       jstimehandle(val) {
         if (val === '') {
           return '----'

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

@@ -11,14 +11,24 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
-          <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
+
+          <!--<el-button type="primary" size="mini" @click="saveCertEntity">保存推荐信息</el-button>-->
+          <el-button type="primary" size="mini" @click="saveEntity">保存企业信息</el-button>
           <router-link :to="'/oilsupplier/supplier/techlist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
         </span>
       </div>
 
-      <el-tabs tab-position="top">
+      <el-steps :active="stepActive" 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-steps>
+
+      <el-tabs tab-position="right" style="margin-top: 20px">
         <el-tab-pane label="企业基本信息">
           <el-form label-width="120px" ref="EntityForm" :model="formData">
             <el-row>
@@ -35,7 +45,7 @@
                 </el-form-item>
               </el-col>-->
 
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item label="供方名称">
                   <el-input v-model="formData.SupplierName" placeholder="请输入"  style="width: 100%"></el-input>
                 </el-form-item>
@@ -83,19 +93,19 @@
                 </el-form-item>
               </el-col>-->
 
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item label="工商注册号">
                   <el-input v-model="formData.CommercialNo" placeholder="请输入"  style="width: 100%"></el-input>
                 </el-form-item>
               </el-col>
 
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item label="组织机构代码">
                   <el-input v-model="formData.OrganCode" placeholder="请输入"  style="width: 100%"></el-input>
                 </el-form-item>
               </el-col>
 
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item label="税务登记证编号">
                   <el-input v-model="formData.CountryTaxNo" placeholder="请输入"  style="width: 100%"></el-input>
                 </el-form-item>
@@ -107,12 +117,6 @@
                 </el-form-item>
               </el-col>-->
 
-              <el-col :span="24">
-                <el-form-item label="单位地址">
-                  <el-input v-model="formData.Address" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
               <el-col :span="8">
                 <el-form-item label="省直辖市">
                   <el-input v-model="formData.Province" placeholder="请输入"  style="width: 100%"></el-input>
@@ -142,39 +146,10 @@
                   <el-input v-model="formData.ZipCode" placeholder="请输入"  style="width: 100%"></el-input>
                 </el-form-item>
               </el-col>
-            </el-row>
-          </el-form>
 
-          <el-form label-position="top" ref="EntityFormCert" :model="formData">
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item  label="质量管理体系认证情况及认证机构">
-                  <el-input v-model="formData.QualitySystemCert" placeholder="请输入" type="textarea" style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="企业资质证书">
-                  <el-input v-model="formData.QualifCert" placeholder="请输入" type="textarea" style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-              <!--<el-col :span="12">
-                <el-form-item label="企业资质证书级别">
-                  <el-input v-model="formData.QualifCertLevel" placeholder="请输入"  style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>-->
-              <el-col :span="12">
-                <el-form-item label="安全生产许可证">
-                  <el-input v-model="formData.SafetyLicense" placeholder="请输入" type="textarea" style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="中石油勘探与生产工程技术服务市场准入许可证或监督服务市场准入证"> <!--技术服务类准入许可证-->
-                  <el-input v-model="formData.TechServiceLic" placeholder="请输入" type="textarea" style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="行业特殊要求的认证证书">
-                  <el-input v-model="formData.SpecIndustryCert" placeholder="请输入" type="textarea" style="width: 100%"></el-input>
+              <el-col :span="16">
+                <el-form-item label="单位地址">
+                  <el-input v-model="formData.Address" placeholder="请输入"  style="width: 100%"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -314,246 +289,219 @@
           </el-form>
 
           <el-form label-position="top" ref="EntityFormCert" :model="formData">
-            <el-row>
-              <el-col :span="24">
-                <el-form-item  label="企业简介（成立时间、人数、经营规模、信誉、主要生产设备及保障能力等情况）">
-                  <el-input v-model="formData.QualitySystemCert" placeholder="请输入" type="textarea" style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-col :span="24">
-              <el-form-item label="备注">
-                <el-input v-model="formData.Remark" placeholder="请输入"  type="textarea" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-          </el-form>
-        </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-row :gutter="20">
               <el-col :span="8">
-                <el-form-item label="交费通知">
-                  <el-input v-model="formData.PayNotice" placeholder="请输入"  style="width: 100%"></el-input>
+                <el-form-item  label="质量管理体系认证情况及认证机构">
+                  <el-input v-model="formData.QualitySystemCert" placeholder="请输入" type="textarea" 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 label="企业资质证书">
+                  <el-input v-model="formData.QualifCert" placeholder="请输入" type="textarea" 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-col :span="12">
+                <el-form-item label="企业资质证书级别">
+                  <el-input v-model="formData.QualifCertLevel" placeholder="请输入"  style="width: 100%"></el-input>
                 </el-form-item>
-              </el-col>
-
+              </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 label="安全生产许可证">
+                  <el-input v-model="formData.SafetyLicense" placeholder="请输入" type="textarea" 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 label="中石油勘探与生产工程技术服务市场准入许可证或监督服务市场准入证"> <!--技术服务类准入许可证-->
+                  <el-input v-model="formData.TechServiceLic" placeholder="请输入" type="textarea" 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 label="行业特殊要求的认证证书">
+                  <el-input v-model="formData.SpecIndustryCert" placeholder="请输入" type="textarea" 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  label="企业简介（成立时间、人数、经营规模、信誉、主要生产设备及保障能力等情况）">
+                  <el-input v-model="formData.QualitySystemCert" placeholder="请输入" type="textarea" 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-col :span="24">
+                <el-form-item label="备注">
+                  <el-input v-model="formData.Remark" placeholder="请输入"  type="textarea" style="width: 100%"></el-input>
                 </el-form-item>
               </el-col>
+            </el-row>
 
-              <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-form>
+        </el-tab-pane>
 
-              <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-tab-pane label="推荐信息" >
+          <SupplierCertEdit ref="SupplierCertEditCompoment" :EntityId="1"></SupplierCertEdit>
+        </el-tab-pane>-->
+        <el-tab-pane label="企业情况">
+          <el-card class="box-card">
+            <div slot="header" class="clearfix">
+              <span>企业人员结构情况</span>
+              <span style="float: right;">
+                <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
+              </span>
+            </div>
+
+            <el-form label-width="220px" ref="EntityForm" :model="formData">
+              <el-row>
+                <el-col :span="8">
+                  <el-form-item label="企业员工总数">
+                    <el-input v-model="formData.SupplierName" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="合同化用工数量">
+                    <el-input v-model="formData.SupplierName" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="大学及以上学历人员数量">
+                    <el-input v-model="formData.SupplierName" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="技术、管理人员数量">
+                    <el-input v-model="formData.SupplierName" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="高级及以上职称人员数量">
+                    <el-input v-model="formData.SupplierName" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="中级职称人员数量">
+                    <el-input v-model="formData.SupplierName" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="具有国家注册执业资格人员数量">
+                    <el-input v-model="formData.SupplierName" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="具有国家注册执业资格证书总数">
+                    <el-input v-model="formData.SupplierName" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="设计人员总数">
+                    <el-input v-model="formData.SupplierName" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="技术工人总数">
+                    <el-input v-model="formData.SupplierName" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </el-card>
+
+          <el-card class="box-card" style="margin-top: 10px;">
+            <div slot="header" class="clearfix">
+              <span>企业主要装备情况</span>
+              <el-button style="float: right; padding: 3px 0" type="text">添加</el-button>
+            </div>
+            <supplier-file-table height="360px" style="margin-top: 20px"></supplier-file-table>
+          </el-card>
+
+          <el-card class="box-card" style="margin-top: 10px;">
+            <div slot="header" class="clearfix">
+              <span>近三年主要工程业绩</span>
+              <el-button style="float: right; padding: 3px 0" type="text">添加</el-button>
+            </div>
+            <supplier-file-table height="360px" style="margin-top: 20px"></supplier-file-table>
+          </el-card>
+
+          <el-card class="box-card" style="margin-top: 10px;">
+            <div slot="header" class="clearfix">
+              <span>拥有专利、专有技术及工法</span>
+              <el-button style="float: right; padding: 3px 0" type="text">添加</el-button>
+            </div>
+            <supplier-file-table height="360px" style="margin-top: 20px"></supplier-file-table>
+          </el-card>
+
+          <el-card class="box-card" style="margin-top: 10px;">
+            <div slot="header" class="clearfix">
+              <span>近三年获得省部级及以上主要技术、管理成果、获奖项目</span>
+              <el-button style="float: right; padding: 3px 0" type="text">添加</el-button>
+            </div>
+            <supplier-file-table height="360px" style="margin-top: 20px"></supplier-file-table>
+          </el-card>
 
-              <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-tab-pane>
 
-              <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-tab-pane label="选择准入范围">
+
+          <el-card class="box-card">
+            <div slot="header" class="clearfix">
+              <span style="font-weight: bold">分类</span>
+              <el-button style="float: right; padding: 3px 0" type="text">添加</el-button>
+            </div>
+            <el-table border height="360px" style="width: 100%">
+              <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-card>
+
+          <el-card class="box-card" style="margin-top: 10px;">
+            <div slot="header" class="clearfix">
+              <span style="font-weight: bold">分类文档</span>
+              <el-button style="float: right; padding: 3px 0" type="text">添加</el-button>
+            </div>
+            <supplier-file-table height="360px" style="margin-top: 20px"></supplier-file-table>
+          </el-card>
 
-              <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>
 
-        <el-tab-pane label="审批流程">
-          审批流程
+        <el-tab-pane label="审批流程" :disabled="true">
+          <wf-history :entryinfo="entrydetail"></wf-history>
         </el-tab-pane>
       </el-tabs>
 
@@ -566,9 +514,17 @@
   import {
     mapGetters
   } from 'vuex'
-  import api from '@/api/oilsupplier/supplier';
+  import api from '@/api/oilsupplier/supplier'
+  import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
+  import WfHistory from '@/components/workflow/wfhistory.vue'
+  import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
+
   export default {
-    components: {},
+    components: {
+      SupplierFileTable,
+      WfHistory,
+      SupplierCertEdit
+    },
     computed: {
       ...mapGetters({
         authUser: 'authUser'
@@ -576,9 +532,10 @@
     },
     name: 'oilsupplierEdit',
 
-    data() {
+    data () {
       return {
         serviceId: '',
+        stepActive: 0,
         formData: {
           Id: '',
           SupplierName: '',
@@ -637,16 +594,23 @@
           ModifiedOn: '',
           ModifiedUserId: '',
           ModifiedBy: '',
+          SupplierTypeCode: '03',
+          SupplierTypeName: '技术服务类'
 
         },
+        entrydetail: {
+          process: '',
+          business: '',
+          instance: '',
+        },
 
         tableColumns: [
-          {
+          /*{
             prop: "SubClassId",
-            label: '分类名称',
+            label: '',
             width: 100,
             sort: true
-          },
+          },*/
 
           {
             prop: "Code",
@@ -709,15 +673,15 @@
       },
 
       //保存信息
-      saveEntity() {
+      saveEntity () {
         this.$refs['EntityForm'].validate((valid) => {
           if (valid) {
             //this.formData.WellNo = this.$refs.selectWellNo.selectedLabel + '';
-
             if (!this.formData.Id) {
-              this.addEntity();
+              this.addEntity()
+              this.next()
             } else {
-              this.updateEntity();
+              this.updateEntity()
             }
 
           } else {
@@ -726,7 +690,14 @@
         })
       },
 
+      //保存信息
+      saveCertEntity () {
+        this.$refs['SupplierCertEditCompoment'].saveEntity()
+      },
+
       addEntity() {
+        this.formData.SupplierTypeCode = '02'
+        this.formData.SupplierTypeName = '技术服务类'
         api.addEntity(this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改
@@ -769,6 +740,10 @@
         });
       },
 
+      next() {
+        if (this.stepActive++ > 5) this.stepActive = 5;
+      },
+
       jstimehandle(val) {
         if (val === '') {
           return '----'

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

@@ -34,7 +34,7 @@
       <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="'/lims/oilsupplier/supplier/' + scope.row.Id + '/basisedit'">
+            <router-link :to="'/oilsupplier/supplier/' + scope.row.Id + '/basisedit'">
               <el-button type="text" title="编辑" size="small" icon="el-icon-edit"></el-button>
             </router-link>
 
@@ -57,7 +57,7 @@
         </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>
+                         v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable :width="column.width" :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">
@@ -525,227 +525,227 @@
         },
         tableColumns: [
 
-          {
-            prop: "Id",
-            label: '',
-            width: 100,
-            sort: true
-          },
+          /*{
+           prop: "Id",
+           label: '',
+           width: 100,
+           sort: true
+           },*/
 
           {
             prop: "SupplierName",
             label: '企业名称',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "OilCertificateNo",
-            label: '中石油供应商证书号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Grade",
-            label: '级别',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "MgrUnit",
-            label: '管理单位',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "OperType",
-            label: '经营方式',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Country",
-            label: '国家',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "MaunAgent",
-            label: '所代理制造商名称',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ConstructTeam",
-            label: '施工队伍名称',
-            width: 100,
-            sort: true
-          },
+            width: 260,
+            sort: true
+          },
+
+          /*{
+           prop: "OilCertificateNo",
+           label: '中石油供应商证书号',
+           width: 100,
+           sort: true
+           },
+
+           {
+           prop: "Grade",
+           label: '级别',
+           width: 100,
+           sort: true
+           },*/
+
+          /*{
+           prop: "MgrUnit",
+           label: '管理单位',
+           width: 100,
+           sort: true
+           },*/
+
+          /*{
+           prop: "OperType",
+           label: '经营方式',
+           width: 100,
+           sort: true
+           },*/
+
+          /*{
+           prop: "Country",
+           label: '国家',
+           width: 100,
+           sort: true
+           },
+
+           {
+           prop: "MaunAgent",
+           label: '所代理制造商名称',
+           width: 100,
+           sort: true
+           },
+
+           {
+           prop: "ConstructTeam",
+           label: '施工队伍名称',
+           width: 100,
+           sort: true
+           },*/
 
           {
             prop: "CommercialNo",
             label: '工商注册号',
-            width: 100,
+            width: 260,
             sort: true
           },
 
-          {
-            prop: "OrganCode",
-            label: '组织机构代码',
-            width: 100,
-            sort: true
-          },
+          /*{
+           prop: "OrganCode",
+           label: '组织机构代码',
+           width: 100,
+           sort: true
+           },*/
 
           {
             prop: "CountryTaxNo",
-            label: '税务登记证国税编号',
-            width: 100,
+            label: '税务登记证编号',
+            width: 260,
             sort: true
           },
 
-          {
-            prop: "LocalTaxNo",
-            label: '税务登记证地税编号',
-            width: 100,
-            sort: true
-          },
+          /*{
+           prop: "LocalTaxNo",
+           label: '税务登记证地税编号',
+           width: 100,
+           sort: true
+           },*/
 
           {
             prop: "Address",
             label: '单位地址',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Province",
-            label: '省直辖市',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "City",
-            label: '地市区县',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Street",
-            label: '街道',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "HouseNo",
-            label: '门牌号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ZipCode",
-            label: '邮编',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "QualitySystemCert",
-            label: '质量管理体系认证情况及认证机构',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ProductQualityCert",
-            label: '产品质量认证情况及认证机构',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "MaunLicense",
-            label: '生产制造许可证获证情况及编号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "QualifCert",
-            label: '企业资质证书编号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "QualifCertLevel",
-            label: '企业资质证书级别',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SafetyLicense",
-            label: '安全生产许可证',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "TechServiceLic",
-            label: '技术服务类准入许可证',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "TJInNotify",
-            label: '外地企业进津备案通知书',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SpecIndustryCert",
-            label: '行业特殊要求的认证证书',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "LegalPerson",
-            label: '法定代表人姓名',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "CategoryCode",
-            label: '行业类别代码',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "CategoryName",
-            label: '行业类别名称',
-            width: 100,
-            sort: true
-          },
+            width: 360,
+            sort: true
+          },
+
+          /*{
+           prop: "Province",
+           label: '省直辖市',
+           width: 200,
+           sort: true
+           },
+
+           {
+           prop: "City",
+           label: '地市区县',
+           width: 200,
+           sort: true
+           },
+
+           {
+           prop: "Street",
+           label: '街道',
+           width: 200,
+           sort: true
+           },
+
+           {
+           prop: "HouseNo",
+           label: '门牌号',
+           width: 200,
+           sort: true
+           },
+
+           {
+           prop: "ZipCode",
+           label: '邮编',
+           width: 200,
+           sort: true
+           },*/
+
+          /*{
+           prop: "QualitySystemCert",
+           label: '质量管理体系认证情况及认证机构',
+           width: 300,
+           sort: true
+           },
+
+           {
+           prop: "ProductQualityCert",
+           label: '产品质量认证情况及认证机构',
+           width: 300,
+           sort: true
+           },
+
+           {
+           prop: "MaunLicense",
+           label: '生产制造许可证获证情况及编号',
+           width: 100,
+           sort: true
+           },
+
+           {
+           prop: "QualifCert",
+           label: '企业资质证书编号',
+           width: 300,
+           sort: true
+           },
+
+           {
+           prop: "QualifCertLevel",
+           label: '企业资质证书级别',
+           width: 300,
+           sort: true
+           },
+
+           {
+           prop: "SafetyLicense",
+           label: '安全生产许可证',
+           width: 100,
+           sort: true
+           },
+
+           {
+           prop: "TechServiceLic",
+           label: '技术服务类准入许可证',
+           width: 100,
+           sort: true
+           },
+
+           {
+           prop: "TJInNotify",
+           label: '外地企业进津备案通知书',
+           width: 100,
+           sort: true
+           },
+
+           {
+           prop: "SpecIndustryCert",
+           label: '行业特殊要求的认证证书',
+           width: 200,
+           sort: true
+           },
+
+           {
+           prop: "LegalPerson",
+           label: '法定代表人姓名',
+           width: 100,
+           sort: true
+           },
+
+           {
+           prop: "CategoryCode",
+           label: '行业类别代码',
+           width: 100,
+           sort: true
+           },
+
+           {
+           prop: "CategoryName",
+           label: '行业类别名称',
+           width: 100,
+           sort: true
+           },*/
 
           {
             prop: "RegCapital",
             label: '注册资本',
-            width: 100,
+            width: 150,
             sort: true
           },
 
@@ -759,119 +759,119 @@
           {
             prop: "ContactName",
             label: '联系人姓名',
-            width: 100,
+            width: 140,
             sort: true
           },
 
           {
             prop: "CompanyType",
             label: '公司类型',
-            width: 100,
+            width: 150,
             sort: true
           },
 
           {
             prop: "SetupTime",
             label: '成立时间',
-            width: 100,
+            width: 220,
             sort: true
           },
 
           {
             prop: "DepositBank",
             label: '开户银行',
-            width: 100,
+            width: 220,
             sort: true
           },
 
           {
             prop: "BankAccount",
             label: '银行账号',
-            width: 100,
+            width: 220,
             sort: true
           },
 
           {
             prop: "EMail",
             label: '电子邮箱',
-            width: 100,
+            width: 220,
             sort: true
           },
 
           {
             prop: "BankCreditRating",
             label: '银行信用等级',
-            width: 100,
+            width: 220,
             sort: true
           },
 
           {
             prop: "Mobile",
             label: '移动电话',
-            width: 100,
+            width: 220,
             sort: true
           },
 
           {
             prop: "Telphone",
             label: '固定电话',
-            width: 100,
+            width: 220,
             sort: true
           },
 
           {
             prop: "Fax",
             label: '传真',
-            width: 100,
+            width: 220,
             sort: true
           },
 
           {
             prop: "CompanyTel",
             label: '公司电话',
-            width: 100,
+            width: 220,
             sort: true
           },
 
           {
             prop: "QQ",
             label: 'QQ号码',
-            width: 100,
+            width: 220,
             sort: true
           },
 
           {
             prop: "CompanyUrl",
             label: '公司网址',
-            width: 100,
+            width: 220,
             sort: true
           },
 
-          {
-            prop: "SpecSupplier",
-            label: '是否特殊业务供应商(可不招标)',
-            width: 100,
-            sort: true
-          },
+          /*{
+           prop: "SpecSupplier",
+           label: '是否特殊业务供应商(可不招标)',
+           width: 100,
+           sort: true
+           },
 
-          {
-            prop: "SpecTypeCode",
-            label: '业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）',
-            width: 100,
-            sort: true
-          },
+           {
+           prop: "SpecTypeCode",
+           label: '业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）',
+           width: 100,
+           sort: true
+           },
 
-          {
-            prop: "SpecTypeName",
-            label: '业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）',
-            width: 100,
-            sort: true
-          },
+           {
+           prop: "SpecTypeName",
+           label: '业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）',
+           width: 100,
+           sort: true
+           },*/
 
           {
             prop: "Remark",
             label: '备注',
-            width: 100,
+            width: 220,
             sort: true
           }
 
@@ -1012,5 +1012,8 @@
 </script>
 
 <style lang="scss">
-
+  .el-pagination {
+    margin: 1rem 0 2rem;
+    text-align: right;
+  }
 </style>

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

@@ -34,7 +34,7 @@
       <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="'/lims/oilsupplier/supplier/' + scope.row.Id + '/goodsedit'">
+            <router-link :to="'/oilsupplier/supplier/' + scope.row.Id + '/goodsedit'">
               <el-button type="text" title="编辑" size="small" icon="el-icon-edit"></el-button>
             </router-link>
 
@@ -57,7 +57,7 @@
         </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>
+                         v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable :width="column.width" :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">
@@ -525,227 +525,227 @@
         },
         tableColumns: [
 
-          {
-            prop: "Id",
-            label: '',
-            width: 100,
-            sort: true
-          },
+          /*{
+           prop: "Id",
+           label: '',
+           width: 100,
+           sort: true
+           },*/
 
           {
             prop: "SupplierName",
             label: '企业名称',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "OilCertificateNo",
-            label: '中石油供应商证书号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Grade",
-            label: '级别',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "MgrUnit",
-            label: '管理单位',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "OperType",
-            label: '经营方式',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Country",
-            label: '国家',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "MaunAgent",
-            label: '所代理制造商名称',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ConstructTeam",
-            label: '施工队伍名称',
-            width: 100,
-            sort: true
-          },
+            width: 260,
+            sort: true
+          },
+
+          /*{
+           prop: "OilCertificateNo",
+           label: '中石油供应商证书号',
+           width: 100,
+           sort: true
+           },
+
+           {
+           prop: "Grade",
+           label: '级别',
+           width: 100,
+           sort: true
+           },*/
+
+          /*{
+           prop: "MgrUnit",
+           label: '管理单位',
+           width: 100,
+           sort: true
+           },*/
+
+          /*{
+           prop: "OperType",
+           label: '经营方式',
+           width: 100,
+           sort: true
+           },*/
+
+          /*{
+           prop: "Country",
+           label: '国家',
+           width: 100,
+           sort: true
+           },
+
+           {
+           prop: "MaunAgent",
+           label: '所代理制造商名称',
+           width: 100,
+           sort: true
+           },
+
+           {
+           prop: "ConstructTeam",
+           label: '施工队伍名称',
+           width: 100,
+           sort: true
+           },*/
 
           {
             prop: "CommercialNo",
             label: '工商注册号',
-            width: 100,
+            width: 260,
             sort: true
           },
 
-          {
-            prop: "OrganCode",
-            label: '组织机构代码',
-            width: 100,
-            sort: true
-          },
+          /*{
+           prop: "OrganCode",
+           label: '组织机构代码',
+           width: 100,
+           sort: true
+           },*/
 
           {
             prop: "CountryTaxNo",
-            label: '税务登记证国税编号',
-            width: 100,
+            label: '税务登记证编号',
+            width: 260,
             sort: true
           },
 
-          {
-            prop: "LocalTaxNo",
-            label: '税务登记证地税编号',
-            width: 100,
-            sort: true
-          },
+          /*{
+           prop: "LocalTaxNo",
+           label: '税务登记证地税编号',
+           width: 100,
+           sort: true
+           },*/
 
           {
             prop: "Address",
             label: '单位地址',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Province",
-            label: '省直辖市',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "City",
-            label: '地市区县',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Street",
-            label: '街道',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "HouseNo",
-            label: '门牌号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ZipCode",
-            label: '邮编',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "QualitySystemCert",
-            label: '质量管理体系认证情况及认证机构',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ProductQualityCert",
-            label: '产品质量认证情况及认证机构',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "MaunLicense",
-            label: '生产制造许可证获证情况及编号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "QualifCert",
-            label: '企业资质证书编号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "QualifCertLevel",
-            label: '企业资质证书级别',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SafetyLicense",
-            label: '安全生产许可证',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "TechServiceLic",
-            label: '技术服务类准入许可证',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "TJInNotify",
-            label: '外地企业进津备案通知书',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SpecIndustryCert",
-            label: '行业特殊要求的认证证书',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "LegalPerson",
-            label: '法定代表人姓名',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "CategoryCode",
-            label: '行业类别代码',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "CategoryName",
-            label: '行业类别名称',
-            width: 100,
-            sort: true
-          },
+            width: 360,
+            sort: true
+          },
+
+          /*{
+           prop: "Province",
+           label: '省直辖市',
+           width: 200,
+           sort: true
+           },
+
+           {
+           prop: "City",
+           label: '地市区县',
+           width: 200,
+           sort: true
+           },
+
+           {
+           prop: "Street",
+           label: '街道',
+           width: 200,
+           sort: true
+           },
+
+           {
+           prop: "HouseNo",
+           label: '门牌号',
+           width: 200,
+           sort: true
+           },
+
+           {
+           prop: "ZipCode",
+           label: '邮编',
+           width: 200,
+           sort: true
+           },*/
+
+          /*{
+           prop: "QualitySystemCert",
+           label: '质量管理体系认证情况及认证机构',
+           width: 300,
+           sort: true
+           },
+
+           {
+           prop: "ProductQualityCert",
+           label: '产品质量认证情况及认证机构',
+           width: 300,
+           sort: true
+           },
+
+           {
+           prop: "MaunLicense",
+           label: '生产制造许可证获证情况及编号',
+           width: 100,
+           sort: true
+           },
+
+           {
+           prop: "QualifCert",
+           label: '企业资质证书编号',
+           width: 300,
+           sort: true
+           },
+
+           {
+           prop: "QualifCertLevel",
+           label: '企业资质证书级别',
+           width: 300,
+           sort: true
+           },
+
+           {
+           prop: "SafetyLicense",
+           label: '安全生产许可证',
+           width: 100,
+           sort: true
+           },
+
+           {
+           prop: "TechServiceLic",
+           label: '技术服务类准入许可证',
+           width: 100,
+           sort: true
+           },
+
+           {
+           prop: "TJInNotify",
+           label: '外地企业进津备案通知书',
+           width: 100,
+           sort: true
+           },
+
+           {
+           prop: "SpecIndustryCert",
+           label: '行业特殊要求的认证证书',
+           width: 200,
+           sort: true
+           },
+
+           {
+           prop: "LegalPerson",
+           label: '法定代表人姓名',
+           width: 100,
+           sort: true
+           },
+
+           {
+           prop: "CategoryCode",
+           label: '行业类别代码',
+           width: 100,
+           sort: true
+           },
+
+           {
+           prop: "CategoryName",
+           label: '行业类别名称',
+           width: 100,
+           sort: true
+           },*/
 
           {
             prop: "RegCapital",
             label: '注册资本',
-            width: 100,
+            width: 150,
             sort: true
           },
 
@@ -759,119 +759,119 @@
           {
             prop: "ContactName",
             label: '联系人姓名',
-            width: 100,
+            width: 140,
             sort: true
           },
 
           {
             prop: "CompanyType",
             label: '公司类型',
-            width: 100,
+            width: 150,
             sort: true
           },
 
           {
             prop: "SetupTime",
             label: '成立时间',
-            width: 100,
+            width: 220,
             sort: true
           },
 
           {
             prop: "DepositBank",
             label: '开户银行',
-            width: 100,
+            width: 220,
             sort: true
           },
 
           {
             prop: "BankAccount",
             label: '银行账号',
-            width: 100,
+            width: 220,
             sort: true
           },
 
           {
             prop: "EMail",
             label: '电子邮箱',
-            width: 100,
+            width: 220,
             sort: true
           },
 
           {
             prop: "BankCreditRating",
             label: '银行信用等级',
-            width: 100,
+            width: 220,
             sort: true
           },
 
           {
             prop: "Mobile",
             label: '移动电话',
-            width: 100,
+            width: 220,
             sort: true
           },
 
           {
             prop: "Telphone",
             label: '固定电话',
-            width: 100,
+            width: 220,
             sort: true
           },
 
           {
             prop: "Fax",
             label: '传真',
-            width: 100,
+            width: 220,
             sort: true
           },
 
           {
             prop: "CompanyTel",
             label: '公司电话',
-            width: 100,
+            width: 220,
             sort: true
           },
 
           {
             prop: "QQ",
             label: 'QQ号码',
-            width: 100,
+            width: 220,
             sort: true
           },
 
           {
             prop: "CompanyUrl",
             label: '公司网址',
-            width: 100,
+            width: 220,
             sort: true
           },
 
-          {
-            prop: "SpecSupplier",
-            label: '是否特殊业务供应商(可不招标)',
-            width: 100,
-            sort: true
-          },
+          /*{
+           prop: "SpecSupplier",
+           label: '是否特殊业务供应商(可不招标)',
+           width: 100,
+           sort: true
+           },
 
-          {
-            prop: "SpecTypeCode",
-            label: '业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）',
-            width: 100,
-            sort: true
-          },
+           {
+           prop: "SpecTypeCode",
+           label: '业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）',
+           width: 100,
+           sort: true
+           },
 
-          {
-            prop: "SpecTypeName",
-            label: '业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）',
-            width: 100,
-            sort: true
-          },
+           {
+           prop: "SpecTypeName",
+           label: '业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）',
+           width: 100,
+           sort: true
+           },*/
 
           {
             prop: "Remark",
             label: '备注',
-            width: 100,
+            width: 220,
             sort: true
           }
 
@@ -1012,5 +1012,8 @@
 </script>
 
 <style lang="scss">
-
+  .el-pagination {
+    margin: 1rem 0 2rem;
+    text-align: right;
+  }
 </style>

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

@@ -31,10 +31,10 @@
           </el-form-item>
         </el-form>
       </div>
-      <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
+      <el-table :data="entityList" border height="calc(100vh - 246px)" style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" min-width="100" align="center" fixed>
           <template slot-scope="scope">
-            <router-link :to="'/lims/oilsupplier/supplier/' + scope.row.Id + '/techedit'">
+            <router-link :to="'/oilsupplier/supplier/' + scope.row.Id + '/techedit'">
               <el-button type="text" title="编辑" size="small" icon="el-icon-edit"></el-button>
             </router-link>
 
@@ -57,7 +57,7 @@
         </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>
+                         v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable :width="column.width" :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">
@@ -520,26 +520,26 @@
           CreateBy: '',
           ModifiedOn: '',
           ModifiedUserId: '',
-          ModifiedBy: '',
+          ModifiedBy: ''
 
         },
         tableColumns: [
 
-          {
+          /*{
             prop: "Id",
             label: '',
             width: 100,
             sort: true
-          },
+          },*/
 
           {
             prop: "SupplierName",
             label: '企业名称',
-            width: 100,
+            width: 260,
             sort: true
           },
 
-          {
+          /*{
             prop: "OilCertificateNo",
             label: '中石油供应商证书号',
             width: 100,
@@ -551,23 +551,23 @@
             label: '级别',
             width: 100,
             sort: true
-          },
+          },*/
 
-          {
+          /*{
             prop: "MgrUnit",
             label: '管理单位',
             width: 100,
             sort: true
-          },
+          },*/
 
-          {
+          /*{
             prop: "OperType",
             label: '经营方式',
             width: 100,
             sort: true
-          },
+          },*/
 
-          {
+          /*{
             prop: "Country",
             label: '国家',
             width: 100,
@@ -586,89 +586,89 @@
             label: '施工队伍名称',
             width: 100,
             sort: true
-          },
+          },*/
 
           {
             prop: "CommercialNo",
             label: '工商注册号',
-            width: 100,
+            width: 260,
             sort: true
           },
 
-          {
+          /*{
             prop: "OrganCode",
             label: '组织机构代码',
             width: 100,
             sort: true
-          },
+          },*/
 
           {
             prop: "CountryTaxNo",
-            label: '税务登记证国税编号',
-            width: 100,
+            label: '税务登记证编号',
+            width: 260,
             sort: true
           },
 
-          {
+          /*{
             prop: "LocalTaxNo",
             label: '税务登记证地税编号',
             width: 100,
             sort: true
-          },
+          },*/
 
           {
             prop: "Address",
             label: '单位地址',
-            width: 100,
+            width: 360,
             sort: true
           },
 
-          {
+          /*{
             prop: "Province",
             label: '省直辖市',
-            width: 100,
+            width: 200,
             sort: true
           },
 
           {
             prop: "City",
             label: '地市区县',
-            width: 100,
+            width: 200,
             sort: true
           },
 
           {
             prop: "Street",
             label: '街道',
-            width: 100,
+            width: 200,
             sort: true
           },
 
           {
             prop: "HouseNo",
             label: '门牌号',
-            width: 100,
+            width: 200,
             sort: true
           },
 
           {
             prop: "ZipCode",
             label: '邮编',
-            width: 100,
+            width: 200,
             sort: true
-          },
+          },*/
 
-          {
+          /*{
             prop: "QualitySystemCert",
             label: '质量管理体系认证情况及认证机构',
-            width: 100,
+            width: 300,
             sort: true
           },
 
           {
             prop: "ProductQualityCert",
             label: '产品质量认证情况及认证机构',
-            width: 100,
+            width: 300,
             sort: true
           },
 
@@ -682,14 +682,14 @@
           {
             prop: "QualifCert",
             label: '企业资质证书编号',
-            width: 100,
+            width: 300,
             sort: true
           },
 
           {
             prop: "QualifCertLevel",
             label: '企业资质证书级别',
-            width: 100,
+            width: 300,
             sort: true
           },
 
@@ -717,7 +717,7 @@
           {
             prop: "SpecIndustryCert",
             label: '行业特殊要求的认证证书',
-            width: 100,
+            width: 200,
             sort: true
           },
 
@@ -740,12 +740,12 @@
             label: '行业类别名称',
             width: 100,
             sort: true
-          },
+          },*/
 
           {
             prop: "RegCapital",
             label: '注册资本',
-            width: 100,
+            width: 150,
             sort: true
           },
 
@@ -759,95 +759,95 @@
           {
             prop: "ContactName",
             label: '联系人姓名',
-            width: 100,
+            width: 140,
             sort: true
           },
 
           {
             prop: "CompanyType",
             label: '公司类型',
-            width: 100,
+            width: 150,
             sort: true
           },
 
           {
             prop: "SetupTime",
             label: '成立时间',
-            width: 100,
+            width: 220,
             sort: true
           },
 
           {
             prop: "DepositBank",
             label: '开户银行',
-            width: 100,
+            width: 220,
             sort: true
           },
 
           {
             prop: "BankAccount",
             label: '银行账号',
-            width: 100,
+            width: 220,
             sort: true
           },
 
           {
             prop: "EMail",
             label: '电子邮箱',
-            width: 100,
+            width: 220,
             sort: true
           },
 
           {
             prop: "BankCreditRating",
             label: '银行信用等级',
-            width: 100,
+            width: 220,
             sort: true
           },
 
           {
             prop: "Mobile",
             label: '移动电话',
-            width: 100,
+            width: 220,
             sort: true
           },
 
           {
             prop: "Telphone",
             label: '固定电话',
-            width: 100,
+            width: 220,
             sort: true
           },
 
           {
             prop: "Fax",
             label: '传真',
-            width: 100,
+            width: 220,
             sort: true
           },
 
           {
             prop: "CompanyTel",
             label: '公司电话',
-            width: 100,
+            width: 220,
             sort: true
           },
 
           {
             prop: "QQ",
             label: 'QQ号码',
-            width: 100,
+            width: 220,
             sort: true
           },
 
           {
             prop: "CompanyUrl",
             label: '公司网址',
-            width: 100,
+            width: 220,
             sort: true
           },
 
-          {
+          /*{
             prop: "SpecSupplier",
             label: '是否特殊业务供应商(可不招标)',
             width: 100,
@@ -866,12 +866,12 @@
             label: '业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）',
             width: 100,
             sort: true
-          },
+          },*/
 
           {
             prop: "Remark",
             label: '备注',
-            width: 100,
+            width: 220,
             sort: true
           }
 
@@ -1012,5 +1012,8 @@
 </script>
 
 <style lang="scss">
-
+  .el-pagination {
+    margin: 1rem 0 2rem;
+    text-align: right;
+  }
 </style>

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

@@ -0,0 +1,524 @@
+
+
+<template>
+  <div>
+    <el-breadcrumb class="heading">
+      <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilsupplier/supplierappend' }">增项信息表</el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-card class="box-card" style="height: calc(100vh - 115px);">
+      <div slot="header">
+        <span>
+          <i class="icon icon-table2"></i> 增项信息表
+        </span>
+        <span style="float: right;">
+          <router-link :to="'/oilsupplier/supplierappend/subdata/dataopera'">
+            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">添加</el-button>
+          </router-link>
+        </span>
+        <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+          <el-form-item label="上报时间">
+            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
+                            start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
+          </el-form-item>
+
+          <el-form-item>
+            <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
+              查询
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="search">高级查询</el-dropdown-item>
+                <el-dropdown-item command="clear">查询重置</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </el-form-item>
+        </el-form>
+      </div>
+      <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/supplierappend/' + 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-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-card>
+
+    <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
+      <el-form ref="advancedsearchForm" label-width="110px">
+        <el-row>
+
+          <el-col :span="12">
+            <el-form-item label="生成时间">
+              <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
+                              start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.Id" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="供方表ID">
+              <el-input size="mini" v-model="searchForm.SupplierId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="供方证书表ID">
+              <el-input size="mini" v-model="searchForm.SupplierCertId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="申请日期">
+              <el-input size="mini" v-model="searchForm.ApplyDate" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="推荐单位编码">
+              <el-input size="mini" v-model="searchForm.RecUnitId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="推荐单位名称">
+              <el-input size="mini" v-model="searchForm.RecUnitName" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="申请准入的范围">
+              <el-input size="mini" v-model="searchForm.WorkRange" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="退回原因">
+              <el-input size="mini" v-model="searchForm.DenyReason" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="审核日期">
+              <el-input size="mini" v-model="searchForm.AuditDate" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="状态标识">
+              <el-input size="mini" v-model="searchForm.Status" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="备注">
+              <el-input size="mini" v-model="searchForm.Remark" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="删除状态，0正常，1已删除">
+              <el-input size="mini" v-model="searchForm.IsDelete" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.CreateOn" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.CreateUserId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.CreateBy" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.ModifiedOn" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.ModifiedUserId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.ModifiedBy" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
+      </span>
+    </el-dialog>
+
+  </div>
+</template>
+<script>
+  import { mapGetters } from 'vuex';
+  import api from '@/api/oilsupplier/supplierappend';
+
+  export default {
+    computed: {
+      ...mapGetters({
+        authUser: 'authUser'
+      })
+    },
+    name: 'oilsuppliercertappend',
+
+    data() {
+      return {
+        dialogVisible: false,
+        //列表数据
+        entityList: [],
+        //分页参数
+        size: 10,
+        currentPage: 1,
+        currentItemCount: 0,
+        //列表排序
+        Column: {
+          Order: '',
+          Prop: ''
+        },
+        //查询时间
+        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        //查询项
+        searchFormReset: {},
+        searchForm: {
+          Id: '',
+          SupplierId: '',
+          SupplierCertId: '',
+          ApplyDate: '',
+          RecUnitId: '',
+          RecUnitName: '',
+          WorkRange: '',
+          DenyReason: '',
+          AuditDate: '',
+          Status: '',
+          Remark: '',
+          IsDelete: '',
+          CreateOn: '',
+          CreateUserId: '',
+          CreateBy: '',
+          ModifiedOn: '',
+          ModifiedUserId: '',
+          ModifiedBy: '',
+
+        },
+        tableColumns: [
+
+          /*{
+            prop: "Id",
+            label: '',
+            width: 100,
+            sort: true
+          },*/
+
+          /*{
+            prop: "SupplierId",
+            label: '供方表ID',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "SupplierCertId",
+            label: '供方证书表ID',
+            width: 100,
+            sort: true
+          },*/
+
+          {
+            prop: "ApplyDate",
+            label: '申请日期',
+            width: 200,
+            sort: true
+          },
+
+          /*{
+            prop: "RecUnitId",
+            label: '推荐单位编码',
+            width: 100,
+            sort: true
+          },*/
+
+          {
+            prop: "RecUnitName",
+            label: '推荐单位名称',
+            width: 200,
+            sort: true
+          },
+
+          {
+            prop: "WorkRange",
+            label: '申请准入的范围',
+            width: 200,
+            sort: true
+          },
+
+          {
+            prop: "DenyReason",
+            label: '退回原因',
+            width: 200,
+            sort: true
+          },
+
+          {
+            prop: "AuditDate",
+            label: '审核日期',
+            width: 200,
+            sort: true
+          },
+
+          {
+            prop: "Status",
+            label: '状态标识',
+            width: 120,
+            sort: true
+          },
+
+          {
+            prop: "Remark",
+            label: '备注',
+            width: 200,
+            sort: true
+          },
+
+          /*{
+            prop: "IsDelete",
+            label: '删除状态，0正常，1已删除',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "CreateOn",
+            label: '',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "CreateUserId",
+            label: '',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "CreateBy",
+            label: '',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "ModifiedOn",
+            label: '',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "ModifiedUserId",
+            label: '',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "ModifiedBy",
+            label: '',
+            width: 100,
+            sort: true
+          },*/
+
+        ]
+      }
+    },
+    created() {
+      //查询条件初始值备份
+      Object.assign(this.searchFormReset, this.searchForm);
+      //查询列表
+      this.initDatas();
+      //this.getDictOptions()
+    },
+    methods: {
+      initDatas() {
+        //分页及列表条件
+        let params = {
+          _currentPage: this.currentPage,
+          _size: this.size,
+          Order: this.Column.Order,
+          Prop: this.Column.Prop,
+        }
+        let myCreateOn = []
+        // 解析时间
+        if (this.CreateOn.length == 2) {
+          this.CreateOn[1].setHours(23)
+          this.CreateOn[1].setMinutes(59)
+          this.CreateOn[1].setSeconds(59)
+          myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
+          myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
+        }
+        //查询条件
+        Object.assign(params, this.searchForm)
+        //访问接口
+        api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
+          this.entityList = res.data.items
+          this.currentItemCount = res.data.currentItemCount
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      getDictOptions() {
+        api.getDictList(this.$axios).then(res => {
+          //this.dictOptions.customerList = res.data.items['customerList']
+          //this.dictOptions.projectList = res.data.items['projectList']
+
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      searchCommand(command) {
+        if (command == 'search') {
+          this.dialogVisible = true
+        } else if (command == 'clear') {
+          this.clearSearch()
+        }
+      },
+      //列表排序功能
+      orderby(column) {
+        if (column.order == 'ascending') {
+          this.Column.Order = 'asc'
+        } else if (column.order == 'descending') {
+          this.Column.Order = 'desc'
+        }
+        this.Column.Prop = column.prop
+        this.initDatas()
+      },
+      clearSearch() {
+        Object.assign(this.searchForm, this.searchFormReset);
+        //this.searchForm = this.searchFormReset;
+        this.CreateOn = ''
+        this.initDatas()
+      },
+      handleSearch() {
+        this.currentPage = 1;
+        this.dialogVisible = false;
+        this.initDatas();
+      },
+      handleCurrentChange(value) {
+        this.currentPage = value
+        this.initDatas()
+      },
+      handleSizeChange(value) {
+        this.size = value
+        this.currentPage = 1
+        this.initDatas()
+      },
+      deleteEntity(row) {
+        row.deleteConfirmFlag = false;
+        api.deleteEntity(row.Id, 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 '----'
+        } else if (val === '0001-01-01T08:00:00+08:00') {
+          return '----'
+        } else if (val === '5000-01-01T23:59:59+08:00') {
+          return '永久'
+        } else {
+          val = val.replace('T', ' ')
+          return val.substring(0, 10)
+        }
+      },
+
+      formatDateTime(date) {
+        var y = date.getFullYear();
+        var m = date.getMonth() + 1;
+        m = m < 10 ? ('0' + m) : m;
+        var d = date.getDate();
+        d = d < 10 ? ('0' + d) : d;
+        var h = date.getHours();
+        var minute = date.getMinutes();
+        minute = minute < 10 ? ('0' + minute) : minute;
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
+      }
+    }
+  }
+
+</script>
+
+<style lang="scss">
+  .el-pagination {
+    margin: 1rem 0 2rem;
+    text-align: right;
+  }
+</style>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/subdata/datalist.vue

@@ -0,0 +1,359 @@
+<template>
+  <div>
+    <el-card class="box-card" style="height: calc(100vh - 270px);">
+      <el-table :data="entityList" border height="calc(100vh - 345px)" style="width: 100%" @sort-change="orderby">
+        <el-table-column label="操作" min-width="100" align="center" fixed>
+          <template slot-scope="scope">
+            <el-button type="text" title="编辑" size="small" icon="el-icon-edit" @click="EditEntity(scope.row)"></el-button>
+            <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 scope="scope">
+            {{ jstimehandle(scope.row.CreateOn+'') }}
+          </template>
+        </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-card>
+
+    <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
+      <el-form ref="advancedsearchForm" label-width="110px">
+        <el-row>
+
+          <el-col :span="12">
+            <el-form-item label="生成时间">
+              <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
+                              start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.Id" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="供方基本信息表主键">
+              <el-input size="mini" v-model="searchForm.SupplierId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="供方准入证书信息表主键">
+              <el-input size="mini" v-model="searchForm.SupplierCertId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="增项信息表ID">
+              <el-input size="mini" v-model="searchForm.SupplierCertAppendId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="分类表主键（物资类或基建类或技术服务类）">
+              <el-input size="mini" v-model="searchForm.SubClassId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="分类编码">
+              <el-input size="mini" v-model="searchForm.Code" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="分类名称">
+              <el-input size="mini" v-model="searchForm.Name" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="备注">
+              <el-input size="mini" v-model="searchForm.Remark" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="删除状态，0正常，1已删除">
+              <el-input size="mini" v-model="searchForm.IsDelete" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.CreateOn" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.CreateUserId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.CreateBy" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.ModifiedOn" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.ModifiedUserId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.ModifiedBy" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
+      </span>
+    </el-dialog>
+
+  </div>
+</template>
+<script>
+  import { mapGetters } from 'vuex';
+  import api from '@/api/oilsupplier/supplierappendsub';
+
+  export default {
+    computed: {
+      ...mapGetters({
+        authUser: 'authUser'
+      })
+    },
+    name: 'oilsuppliercertappendsub',
+    props: {
+      DataEntryId: Number,
+    },
+
+    data() {
+      return {
+        dialogVisible: false,
+        //列表数据
+        entityList: [],
+        //分页参数
+        size: 10,
+        currentPage: 1,
+        currentItemCount: 0,
+        //列表排序
+        Column: {
+          Order: '',
+          Prop: ''
+        },
+        //查询时间
+        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        //查询项
+        searchFormReset: {},
+        searchForm: {
+          Id: '',
+          SupplierId: '',
+          SupplierCertId: '',
+          SupplierCertAppendId: '',
+          SubClassId: '',
+          Code: '',
+          Name: '',
+          Remark: '',
+          IsDelete: '',
+          CreateOn: '',
+          CreateUserId: '',
+          CreateBy: '',
+          ModifiedOn: '',
+          ModifiedUserId: '',
+          ModifiedBy: '',
+
+        },
+        tableColumns: [
+          {
+            prop: "Code",
+            label: '分类编码',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "Name",
+            label: '分类名称',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "Remark",
+            label: '备注',
+            width: 100,
+            sort: true
+          }
+        ]
+      }
+    },
+    created() {
+      //查询条件初始值备份
+      Object.assign(this.searchFormReset, this.searchForm);
+      //查询列表
+      this.initDatas();
+      //this.getDictOptions()
+    },
+    methods: {
+      initDatas() {
+        //分页及列表条件
+        let params = {
+          _currentPage: this.currentPage,
+          _size: this.size,
+          Order: this.Column.Order,
+          Prop: this.Column.Prop,
+        };
+
+        this.searchForm.DataEntryId = this.DataEntryId;
+        //查询条件
+        Object.assign(params, this.searchForm);
+        //访问接口
+        api.getList('', params, this.$axios).then(res => {
+          this.entityList = res.data.items
+          this.currentItemCount = res.data.currentItemCount
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      getDictOptions() {
+        api.getDictList(this.$axios).then(res => {
+          //this.dictOptions.customerList = res.data.items['customerList']
+          //this.dictOptions.projectList = res.data.items['projectList']
+
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      searchCommand(command) {
+        if (command == 'search') {
+          this.dialogVisible = true
+        } else if (command == 'clear') {
+          this.clearSearch()
+        }
+      },
+      //列表排序功能
+      orderby(column) {
+        if (column.order == 'ascending') {
+          this.Column.Order = 'asc'
+        } else if (column.order == 'descending') {
+          this.Column.Order = 'desc'
+        }
+        this.Column.Prop = column.prop
+        this.initDatas()
+      },
+      clearSearch() {
+        this.searchForm = this.searchFormReset;
+        this.CreateOn = ''
+        this.initDatas()
+      },
+      handleSearch() {
+        this.currentPage = 1;
+        this.dialogVisible = false;
+        this.initDatas();
+      },
+      handleCurrentChange(value) {
+        this.currentPage = value
+        this.initDatas()
+      },
+      handleSizeChange(value) {
+        this.size = value
+        this.currentPage = 1
+        this.initDatas()
+      },
+      deleteEntity(row) {
+        row.deleteConfirmFlag = false;
+        api.deleteEntity(row.Id, 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)
+        });
+      },
+      EditEntity(row) {
+        this.$emit('edit-entity', row.Id)
+      },
+
+      jstimehandle(val) {
+        if (val === '') {
+          return '----'
+        } else if (val === '0001-01-01T08:00:00+08:00') {
+          return '----'
+        } else if (val === '5000-01-01T23:59:59+08:00') {
+          return '永久'
+        } else {
+          val = val.replace('T', ' ')
+          return val.substring(0, 10)
+        }
+      },
+
+      formatDateTime(date) {
+        var y = date.getFullYear();
+        var m = date.getMonth() + 1;
+        m = m < 10 ? ('0' + m) : m;
+        var d = date.getDate();
+        d = d < 10 ? ('0' + d) : d;
+        var h = date.getHours();
+        var minute = date.getMinutes();
+        minute = minute < 10 ? ('0' + minute) : minute;
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
+      }
+    }
+  }
+
+</script>
+
+<style lang="scss">
+  .el-pagination {
+    margin: 1rem 0 2rem;
+    text-align: right;
+  }
+</style>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/subdata/dataopera.vue

@@ -0,0 +1,357 @@
+
+
+<template>
+  <div>
+    <el-breadcrumb class="heading">
+      <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilsupplier/supplierappend' }">增项信息列表</el-breadcrumb-item>
+      <el-breadcrumb-item>编辑</el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-card class="box-card">
+      <div slot="header">
+        <span>
+          <i class="icon icon-table2"></i> 编辑
+        </span>
+        <span style="float: right;">
+          <!--<el-button type="plain" size="mini" style="margin-left:10px; margin-top: -4px;" @click="activeName='1'">添加</el-button>-->
+
+          <el-button type="plain" @click="ShowSearchDialog" size="mini" style="margin-left:10px; margin-top: -4px;">查询</el-button>
+
+          <router-link :to="'/oilsupplier/supplierappend'">
+            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
+          </router-link>
+        </span>
+      </div>
+      <el-collapse accordion v-model="activeName">
+        <el-collapse-item name="1">
+          <template slot="title">
+            增项录入<i class="header-icon el-icon-info"></i>
+          </template>
+          <el-form label-width="150px" ref="EntityForm" :model="formData">
+            <el-row>
+              <!--<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>-->
+
+              <!--<el-col :span="8">
+                <el-form-item label="">
+                  <el-input v-model="formData.Id" placeholder="请输入"  style="width: 100%"></el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="8">
+                <el-form-item label="供方基本信息表主键">
+                  <el-input v-model="formData.SupplierId" placeholder="请输入"  style="width: 100%"></el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="8">
+                <el-form-item label="供方准入证书信息表主键">
+                  <el-input v-model="formData.SupplierCertId" placeholder="请输入"  style="width: 100%"></el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="8">
+                <el-form-item label="增项信息表ID">
+                  <el-input v-model="formData.SupplierCertAppendId" placeholder="请输入"  style="width: 100%"></el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="8">
+                <el-form-item label="分类表主键（物资类或基建类或技术服务类）">
+                  <el-input v-model="formData.SubClassId" placeholder="请输入"  style="width: 100%"></el-input>
+                </el-form-item>
+              </el-col>-->
+
+              <el-col :span="24">
+                <el-form-item label="选择增项">
+                  <el-input v-model="formData.Code" placeholder="请输入"  style="width: 100%"></el-input>
+                </el-form-item>
+              </el-col>
+
+              <!--<el-col :span="8">
+                <el-form-item label="分类名称">
+                  <el-input v-model="formData.Name" placeholder="请输入"  style="width: 100%"></el-input>
+                </el-form-item>
+              </el-col>-->
+
+              <el-col :span="24">
+                <el-form-item label="备注">
+                  <el-input type="textarea" v-model="formData.Remark" placeholder="请输入"  style="width: 100%"></el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="24">
+                <el-form-item :span="24" style="text-align: center;">
+                  <el-button type="primary" size="small" @click="continueInsert"><i class="el-icon-circle-check"></i> 新增</el-button>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-collapse-item>
+      </el-collapse>
+      <data-list ref="DatalistCompoment" :DataEntryId="queryParams.DataEntryId" @edit-entity="subListEditEntity"></data-list>
+    </el-card>
+  </div>
+</template>
+
+<script>
+  import {
+    mapGetters
+  } from 'vuex'
+  import api from '@/api/oilsupplier/supplierappendsub'
+  import DataList from './datalist.vue'
+
+  export default {
+    computed: {
+      ...mapGetters({
+        authUser: 'authUser'
+      })
+    },
+    name: 'oilsuppliercertappendsubEdit',
+    components: {
+      DataList
+    },
+
+    data() {
+      return {
+        serviceId: '',
+        activeName: '1',
+        queryParams: {
+          EId: 0,
+          TaskBalanceId: 0,
+          DataEntryId: 0,
+        },
+        saveBtnName: '新增保存',
+
+        historyData: {},
+        formData: {
+          Id: '',
+          SupplierId: '',
+          SupplierCertId: '',
+          SupplierCertAppendId: '',
+          SubClassId: '',
+          Code: '',
+          Name: '',
+          Remark: '',
+          IsDelete: '',
+          CreateOn: '',
+          CreateUserId: '',
+          CreateBy: '',
+          ModifiedOn: '',
+          ModifiedUserId: '',
+          ModifiedBy: '',
+
+        },
+
+        //下拉选择项
+        EntrustCorpOptions: [],
+        InspecCorpOptions: [],
+        PositionCheckOptions: [],
+        PhaseOptions: [
+          {
+            Label: '单相(D)',
+            Value: 'D'
+          },
+          {
+            Label: '三相(S)',
+            Value: 'S'
+          }
+        ]
+
+      }
+    },
+    created() {
+      this.queryParams.EId = this.$route.query.eid;
+      this.queryParams.TaskBalanceId = this.$route.query.tbid;
+      this.queryParams.DataEntryId = this.$route.query.deid;
+
+      this.getDictOptions();
+      if(this.serviceId>0) {
+        this.formData.Id = this.serviceId;
+        this.initDatas();
+      } else {
+        this.formData.Id = 0;
+        this.formData.EId = this.queryParams.EId;
+        this.formData.TaskBalanceId = this.queryParams.TaskBalanceId;
+        this.formData.DataEntryId = this.queryParams.DataEntryId;
+        this.getEntrustInfo(this.queryParams.EId);
+      }
+      //初始值备份
+      Object.assign(this.historyData, this.formData);
+    },
+    methods: {
+      initDatas() {
+        if(this.formData.Id) {
+          api.getEntity(this.formData.Id, this.$axios).then(res => {
+            this.formData = res.data;
+            //刷新子列表
+            this.$refs["DatalistCompoment"].initDatas();
+          }).catch(err => {
+            console.error(err)
+          });
+        }
+      },
+
+      getDictOptions() {
+        api.getDictList(this.$axios).then(res => {
+          this.EntrustCorpOptions = res.data.items['EntrustCorp'];
+          this.InspecCorpOptions = res.data.items['EntrustCorp'];
+          this.PositionCheckOptions = res.data.items['PositionCheck'];
+
+          //this.wellNoOptions = res.data.items['WellNo']
+          //this.supervisersOptions = res.data.items['Supervisers']
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      getEntrustInfo(EId) {
+        /*entrustApi.getEntrustInfo(EId, this.$axios).then(res => {
+          this.formData.EntrustCorp = res.data.CustomerId;
+        }).catch(err => {
+          // handle error
+          console.error(err)
+        })*/
+      },
+      continueInsert() {
+        this.formData.Id = 0;
+        this.saveBtnName = '新增保存';
+        this.saveEntity();
+      },
+      resetFormData() {
+
+        Object.assign(this.formData, this.historyData);
+        this.saveBtnName = '新增保存';
+        this.formData.Id = 0;
+        this.formData.EId = this.formData.EId;
+        this.formData.TaskBalanceId = this.formData.TaskBalanceId;
+        this.formData.DataEntryId = this.queryParams.DataEntryId;
+        this.getEntrustInfo(this.formData.EId);
+      },
+
+      subListEditEntity(entityId) {
+        this.serviceId = entityId;
+        this.formData.Id = this.serviceId;
+        this.saveBtnName = '修改保存';
+        this.initDatas();
+
+      },
+
+      //保存信息
+      saveEntity() {
+        this.$refs['EntityForm'].validate((valid) => {
+          if (valid) {
+            /*this.formData.EId = this.queryParams.EId;
+             this.formData.TaskBalanceId = this.queryParams.TaskBalanceId;
+             this.formData.DataEntryId = this.queryParams.DataEntryId;*/
+            //if(!this.formData.EId || !this.formData.TaskBalanceId) {
+            if(!this.formData.EId || !this.formData.TaskBalanceId || !this.formData.DataEntryId) {
+              this.$message.warning("委托信息不完整，无法保存，请返回重试！");
+              return;
+            }
+
+            this.formData.InspecCorp = this.$refs.selectInspecCorp.selectedLabel + '';
+            this.formData.EntrustCorp = this.$refs.selectEntrustCorp.selectedLabel + '';
+
+            if (!this.formData.Id) {
+              this.addEntity();
+            } else {
+              this.updateEntity();
+            }
+
+          } else {
+            return false
+          }
+        })
+      },
+
+      addEntity() {
+        api.addEntity(this.formData, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            //保存成功后，初始化数据，变成修改
+            this.formData.Id = res.data.item;
+            this.saveBtnName = '修改保存';
+            this.initDatas();
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            });
+
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            });
+          }
+        }).catch(err => {
+          console.error(err)
+        });
+      },
+
+      updateEntity() {
+        api.updateEntity(this.formData.Id, this.formData, 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)
+        });
+      },
+
+      ShowSearchDialog() {
+        this.$refs["DatalistCompoment"].searchCommand('search');
+      },
+
+      jstimehandle(val) {
+        if (val === '') {
+          return '----'
+        } else if (val === '0001-01-01T08:00:00+08:00') {
+          return '----'
+        } else if (val === '5000-01-01T23:59:59+08:00') {
+          return '永久'
+        } else {
+          val = val.replace('T', ' ')
+          return val.substring(0, 10)
+        }
+      },
+
+      formatDateTime(date) {
+        var y = date.getFullYear();
+        var m = date.getMonth() + 1;
+        m = m < 10 ? ('0' + m) : m;
+        var d = date.getDate();
+        d = d < 10 ? ('0' + d) : d;
+        var h = date.getHours();
+        var minute = date.getMinutes();
+        minute = minute < 10 ? ('0' + minute) : minute;
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
+      }
+    }
+  }
+
+</script>
+
+<style lang="scss">
+
+</style>

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

@@ -0,0 +1,507 @@
+
+
+<template>
+  <div>
+    <el-breadcrumb class="heading">
+      <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilsupplier/supplierfile' }">供方资料表</el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-card class="box-card" style="height: calc(100vh - 115px);">
+      <div slot="header">
+        <span>
+          <i class="icon icon-table2"></i> 供方资料表
+        </span>
+        <span style="float: right;">
+          <router-link :to="'/oilsupplier/supplierfile/add/operation'">
+            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">添加</el-button>
+          </router-link>
+        </span>
+        <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+          <el-form-item label="上报时间">
+            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
+                            start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
+          </el-form-item>
+
+          <el-form-item>
+            <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
+              查询
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="search">高级查询</el-dropdown-item>
+                <el-dropdown-item command="clear">查询重置</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </el-form-item>
+        </el-form>
+      </div>
+      <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/supplierfile/' + 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-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-card>
+
+    <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
+      <el-form ref="advancedsearchForm" label-width="110px">
+        <el-row>
+
+          <el-col :span="12">
+            <el-form-item label="生成时间">
+              <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
+                              start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.Id" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="对应的增项分类ID">
+              <el-input size="mini" v-model="searchForm.AppendClassId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="对应的证书分类ID">
+              <el-input size="mini" v-model="searchForm.SupplierCertSubId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="文件分类">
+              <el-input size="mini" v-model="searchForm.NeedFileType" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="文件分类编码">
+              <el-input size="mini" v-model="searchForm.NeedFileCode" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.FileExt" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.FileSize" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.EffectDate" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.OtherRemark" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="备注">
+              <el-input size="mini" v-model="searchForm.Remark" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="删除状态，0正常，1已删除">
+              <el-input size="mini" v-model="searchForm.IsDelete" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.CreateOn" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.CreateUserId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.CreateBy" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.ModifiedOn" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.ModifiedUserId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.ModifiedBy" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
+      </span>
+    </el-dialog>
+
+  </div>
+</template>
+<script>
+  import { mapGetters } from 'vuex';
+  import api from '@/api/oilsupplier/supplierfile';
+
+  export default {
+    computed: {
+      ...mapGetters({
+        authUser: 'authUser'
+      })
+    },
+    name: 'oilsupplierfile',
+
+    data() {
+      return {
+        dialogVisible: false,
+        //列表数据
+        entityList: [],
+        //分页参数
+        size: 10,
+        currentPage: 1,
+        currentItemCount: 0,
+        //列表排序
+        Column: {
+          Order: '',
+          Prop: ''
+        },
+        //查询时间
+        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        //查询项
+        searchFormReset: {},
+        searchForm: {
+          Id: '',
+          AppendClassId: '',
+          SupplierCertSubId: '',
+          NeedFileType: '',
+          NeedFileCode: '',
+          FileExt: '',
+          FileSize: '',
+          EffectDate: '',
+          OtherRemark: '',
+          Remark: '',
+          IsDelete: '',
+          CreateOn: '',
+          CreateUserId: '',
+          CreateBy: '',
+          ModifiedOn: '',
+          ModifiedUserId: '',
+          ModifiedBy: '',
+
+        },
+        tableColumns: [
+
+          {
+            prop: "Id",
+            label: '',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "AppendClassId",
+            label: '对应的增项分类ID',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "SupplierCertSubId",
+            label: '对应的证书分类ID',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "NeedFileType",
+            label: '文件分类',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "NeedFileCode",
+            label: '文件分类编码',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "FileExt",
+            label: '',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "FileSize",
+            label: '',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "EffectDate",
+            label: '',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "OtherRemark",
+            label: '',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "Remark",
+            label: '备注',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "IsDelete",
+            label: '删除状态，0正常，1已删除',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "CreateOn",
+            label: '',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "CreateUserId",
+            label: '',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "CreateBy",
+            label: '',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "ModifiedOn",
+            label: '',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "ModifiedUserId",
+            label: '',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "ModifiedBy",
+            label: '',
+            width: 100,
+            sort: true
+          },
+
+        ]
+      }
+    },
+    created() {
+      //查询条件初始值备份
+      Object.assign(this.searchFormReset, this.searchForm);
+      //查询列表
+      this.initDatas();
+      //this.getDictOptions()
+    },
+    methods: {
+      initDatas() {
+        //分页及列表条件
+        let params = {
+          _currentPage: this.currentPage,
+          _size: this.size,
+          Order: this.Column.Order,
+          Prop: this.Column.Prop,
+        }
+        let myCreateOn = []
+        // 解析时间
+        if (this.CreateOn.length == 2) {
+          this.CreateOn[1].setHours(23)
+          this.CreateOn[1].setMinutes(59)
+          this.CreateOn[1].setSeconds(59)
+          myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
+          myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
+        }
+        //查询条件
+        Object.assign(params, this.searchForm)
+        //访问接口
+        api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
+          this.entityList = res.data.items
+          this.currentItemCount = res.data.currentItemCount
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      getDictOptions() {
+        api.getDictList(this.$axios).then(res => {
+          //this.dictOptions.customerList = res.data.items['customerList']
+          //this.dictOptions.projectList = res.data.items['projectList']
+
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      searchCommand(command) {
+        if (command == 'search') {
+          this.dialogVisible = true
+        } else if (command == 'clear') {
+          this.clearSearch()
+        }
+      },
+      //列表排序功能
+      orderby(column) {
+        if (column.order == 'ascending') {
+          this.Column.Order = 'asc'
+        } else if (column.order == 'descending') {
+          this.Column.Order = 'desc'
+        }
+        this.Column.Prop = column.prop
+        this.initDatas()
+      },
+      clearSearch() {
+        Object.assign(this.searchForm, this.searchFormReset);
+        //this.searchForm = this.searchFormReset;
+        this.CreateOn = ''
+        this.initDatas()
+      },
+      handleSearch() {
+        this.currentPage = 1;
+        this.dialogVisible = false;
+        this.initDatas();
+      },
+      handleCurrentChange(value) {
+        this.currentPage = value
+        this.initDatas()
+      },
+      handleSizeChange(value) {
+        this.size = value
+        this.currentPage = 1
+        this.initDatas()
+      },
+      deleteEntity(row) {
+        row.deleteConfirmFlag = false;
+        api.deleteEntity(row.Id, 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 '----'
+        } else if (val === '0001-01-01T08:00:00+08:00') {
+          return '----'
+        } else if (val === '5000-01-01T23:59:59+08:00') {
+          return '永久'
+        } else {
+          val = val.replace('T', ' ')
+          return val.substring(0, 10)
+        }
+      },
+
+      formatDateTime(date) {
+        var y = date.getFullYear();
+        var m = date.getMonth() + 1;
+        m = m < 10 ? ('0' + m) : m;
+        var d = date.getDate();
+        d = d < 10 ? ('0' + d) : d;
+        var h = date.getHours();
+        var minute = date.getMinutes();
+        minute = minute < 10 ? ('0' + minute) : minute;
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
+      }
+    }
+  }
+
+</script>
+
+<style lang="scss">
+
+</style>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierfile/table.vue

@@ -0,0 +1,433 @@
+
+
+<template>
+  <div>
+    <el-table :data="entityList" border height="360px" style="width: 100%" @sort-change="orderby">
+      <el-table-column label="操作" min-width="100" align="center" fixed>
+        <template slot-scope="scope">
+          <router-link :to="'/oilsupplier/supplierfile/' + 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-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 title="高级查询" :visible.sync="dialogVisible" width="720px">
+      <el-form ref="advancedsearchForm" label-width="110px">
+        <el-row>
+
+          <el-col :span="12">
+            <el-form-item label="生成时间">
+              <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
+                              start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.Id" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="对应的增项分类ID">
+              <el-input size="mini" v-model="searchForm.AppendClassId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="对应的证书分类ID">
+              <el-input size="mini" v-model="searchForm.SupplierCertSubId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="文件分类">
+              <el-input size="mini" v-model="searchForm.NeedFileType" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="文件分类编码">
+              <el-input size="mini" v-model="searchForm.NeedFileCode" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.FileExt" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.FileSize" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.EffectDate" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.OtherRemark" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="备注">
+              <el-input size="mini" v-model="searchForm.Remark" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="删除状态，0正常，1已删除">
+              <el-input size="mini" v-model="searchForm.IsDelete" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.CreateOn" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.CreateUserId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.CreateBy" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.ModifiedOn" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.ModifiedUserId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.ModifiedBy" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
+      </span>
+    </el-dialog>
+
+  </div>
+</template>
+<script>
+  import { mapGetters } from 'vuex';
+  import api from '@/api/oilsupplier/supplierfile';
+
+  export default {
+    computed: {
+      ...mapGetters({
+        authUser: 'authUser'
+      })
+    },
+    name: 'SupplierFileTable',
+
+    data() {
+      return {
+        dialogVisible: false,
+        //列表数据
+        entityList: [],
+        //分页参数
+        size: 10,
+        currentPage: 1,
+        currentItemCount: 0,
+        //列表排序
+        Column: {
+          Order: '',
+          Prop: ''
+        },
+        //查询时间
+        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        //查询项
+        searchFormReset: {},
+        searchForm: {
+          Id: '',
+          AppendClassId: '',
+          SupplierCertSubId: '',
+          NeedFileType: '',
+          NeedFileCode: '',
+          FileExt: '',
+          FileSize: '',
+          EffectDate: '',
+          OtherRemark: '',
+          Remark: '',
+          IsDelete: '',
+          CreateOn: '',
+          CreateUserId: '',
+          CreateBy: '',
+          ModifiedOn: '',
+          ModifiedUserId: '',
+          ModifiedBy: ''
+
+        },
+        tableColumns: [
+
+          /*{
+            prop: "Id",
+            label: '',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "AppendClassId",
+            label: '对应的增项分类ID',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "SupplierCertSubId",
+            label: '对应的证书分类ID',
+            width: 100,
+            sort: true
+          },*/
+
+          {
+            prop: "NeedFileType",
+            label: '文件分类',
+            width: 200,
+            sort: true
+          },
+
+          /*{
+            prop: "NeedFileCode",
+            label: '文件分类编码',
+            width: 100,
+            sort: true
+          },*/
+
+          {
+            prop: "FileExt",
+            label: '扩展名',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "FileSize",
+            label: '文件大小',
+            width: 200,
+            sort: true
+          },
+
+          {
+            prop: "EffectDate",
+            label: '有效时间',
+            width: 160,
+            sort: true
+          },
+
+          {
+            prop: "OtherRemark",
+            label: '其它说明',
+            width: 260,
+            sort: true
+          },
+
+          {
+            prop: "Remark",
+            label: '备注',
+            width: 200,
+            sort: true
+          },
+
+          {
+            prop: "CreateOn",
+            label: '创建日期',
+            width: 200,
+            sort: true
+          }
+
+        ]
+      }
+    },
+    created() {
+      //查询条件初始值备份
+      Object.assign(this.searchFormReset, this.searchForm);
+      //查询列表
+      this.initDatas();
+      //this.getDictOptions()
+    },
+    methods: {
+      initDatas() {
+        //分页及列表条件
+        let params = {
+          _currentPage: this.currentPage,
+          _size: this.size,
+          Order: this.Column.Order,
+          Prop: this.Column.Prop,
+        }
+        let myCreateOn = []
+        // 解析时间
+        if (this.CreateOn.length == 2) {
+          this.CreateOn[1].setHours(23)
+          this.CreateOn[1].setMinutes(59)
+          this.CreateOn[1].setSeconds(59)
+          myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
+          myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
+        }
+        //查询条件
+        Object.assign(params, this.searchForm)
+        //访问接口
+        api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
+          this.entityList = res.data.items
+          this.currentItemCount = res.data.currentItemCount
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      getDictOptions() {
+        api.getDictList(this.$axios).then(res => {
+          //this.dictOptions.customerList = res.data.items['customerList']
+          //this.dictOptions.projectList = res.data.items['projectList']
+
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      searchCommand(command) {
+        if (command == 'search') {
+          this.dialogVisible = true
+        } else if (command == 'clear') {
+          this.clearSearch()
+        }
+      },
+      //列表排序功能
+      orderby(column) {
+        if (column.order == 'ascending') {
+          this.Column.Order = 'asc'
+        } else if (column.order == 'descending') {
+          this.Column.Order = 'desc'
+        }
+        this.Column.Prop = column.prop
+        this.initDatas()
+      },
+      clearSearch() {
+        Object.assign(this.searchForm, this.searchFormReset);
+        //this.searchForm = this.searchFormReset;
+        this.CreateOn = ''
+        this.initDatas()
+      },
+      handleSearch() {
+        this.currentPage = 1;
+        this.dialogVisible = false;
+        this.initDatas();
+      },
+      handleCurrentChange(value) {
+        this.currentPage = value
+        this.initDatas()
+      },
+      handleSizeChange(value) {
+        this.size = value
+        this.currentPage = 1
+        this.initDatas()
+      },
+      deleteEntity(row) {
+        row.deleteConfirmFlag = false;
+        api.deleteEntity(row.Id, 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 '----'
+        } else if (val === '0001-01-01T08:00:00+08:00') {
+          return '----'
+        } else if (val === '5000-01-01T23:59:59+08:00') {
+          return '永久'
+        } else {
+          val = val.replace('T', ' ')
+          return val.substring(0, 10)
+        }
+      },
+
+      formatDateTime(date) {
+        var y = date.getFullYear();
+        var m = date.getMonth() + 1;
+        m = m < 10 ? ('0' + m) : m;
+        var d = date.getDate();
+        d = d < 10 ? ('0' + d) : d;
+        var h = date.getHours();
+        var minute = date.getMinutes();
+        minute = minute < 10 ? ('0' + minute) : minute;
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
+      }
+    }
+  }
+
+</script>
+
+<style lang="scss">
+
+</style>