信息变更资质变更修改

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

@@ -99,6 +99,7 @@ type OilInfoChangeItem struct {
 }
 
 type SuppModelInfo struct {
+	ConmmitTime        time.Time
 	Id                 int       `xorm:"<- not null pk autoincr INT(10)"`
 	AccessCardNo       int       `xorm:"not null default 0 comment('准入证号') INT(10)"`
 	SupplierName       string    `xorm:"comment('企业名称') VARCHAR(255)"`

src/dashoo.cn/backend/api/business/oilsupplier/infochange/infochangeService.go

@@ -160,7 +160,7 @@ func (s *InfoChangeService) GetSuppPagingEntitiesWithOrderBytbl(supplierTableNam
 	var sql string
 	sql = `select a.*, `
 	sql += ` b.Step, `
-	sql += ` b.Status, `
+	sql += ` b.Status, b.CreateOn ConmmitTime, `
 	sql += ` b.WorkflowId `
 	sql += ` from ` + supplierTableName + ` a `
 	sql += ` left join ` + infoChangeName + " b on b.SupplierId = a.Id"

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

@@ -1,6 +1,7 @@
 package qualchange
 
 import (
+	"dashoo.cn/backend/api/business/oilsupplier/supplier"
 	"time"
 )
 
@@ -33,9 +34,11 @@ type OilQualChangeDetail struct {
 
 type OilQualChangeMain struct {
 	Id             int       `xorm:"not null pk autoincr INT(10)"`
+	SupplierId     int       `xorm:"not null comment('供方基本信息表主键') INT(10)"`
 	SupplierName   string    `xorm:"comment('企业名称') VARCHAR(255)"`
 	AccesscardNo   string    `xorm:"comment('准入证号') VARCHAR(20)"`
 	CommercialNo   string    `xorm:"comment('工商注册号') VARCHAR(20)"`
+	Step           int       `xorm:"comment('页面上第几步') INT(10)"`
 	Status         string    `xorm:"comment('状态标识') VARCHAR(10)"`
 	WorkFlowId     string    `xorm:"comment('工作流的ID') VARCHAR(50)"`
 	CreateOn       time.Time `xorm:"DATETIME"`
@@ -45,3 +48,53 @@ type OilQualChangeMain struct {
 	ModifiedUserId int       `xorm:"INT(10)"`
 	ModifiedBy     string    `xorm:"VARCHAR(50)"`
 }
+
+type OilSupplierQual struct {
+	supplier.OilSupplier `xorm:"extends"`
+	CertId               string
+	AccessCardNo         string
+	SupplierTypeCode     string
+	SupplierTypeName     string
+	QualId               int
+	ConmmitTime          time.Time
+	Step                 int       `xorm:"comment('页面上第几步') INT(10)"`
+	WorkFlowId           string    `xorm:"comment('工作流的ID') VARCHAR(50)"`
+	WorkerTotal          int       `xorm:"default 0 comment('企业员工总数') INT(10)"`
+	ContractNum          int       `xorm:"default 0 comment('合同化用工数量') INT(10)"`
+	UniversityNum        int       `xorm:"default 0 comment('大学及以上学历人员数量') INT(10)"`
+	TechnicalNum         int       `xorm:"default 0 comment('技术、管理人员数量') INT(10)"`
+	AboveProfNum         int       `xorm:"default 0 comment('高级及以上职称人员数量') INT(10)"`
+	MiddleProfNum        int       `xorm:"default 0 comment('中级职称人员数量') INT(10)"`
+	NationalRegNum       int       `xorm:"default 0 comment('具有国家注册执业资格人员数量') INT(10)"`
+	NationalCertTotal    int       `xorm:"default 0 comment('具有国家注册执业资格证书总数') INT(10)"`
+	DesignerTotal        int       `xorm:"default 0 comment('设计人员总数') INT(10)"`
+	SkillerTotal         int       `xorm:"default 0 comment('技术工人总数') INT(10)"`
+	Status               string    `xorm:"not null default '0' comment('状态标识(0未申请，1办理完毕)') VARCHAR(10)"`
+	RecUnitReason        string    `xorm:"comment('推荐单位的推荐意见') VARCHAR(800)"`
+	RecUnitPerson        string    `xorm:"comment('推荐单位负责人') VARCHAR(20)"`
+	RecDate              time.Time `xorm:"comment('推荐日期') DATETIME"`
+	RecUnitId            string    `xorm:"comment('推荐单位编码') VARCHAR(10)"`
+	RecUnitName          string    `xorm:"comment('推荐单位名称') VARCHAR(50)"`
+	BackReason           string    `xorm:"comment('退回原因') VARCHAR(50)"`
+	InFlag               string    `xorm:"default '0' comment('准入标识') VARCHAR(10)"`
+	EffectStartTime      time.Time `xorm:"comment('有效期起') DATETIME"`
+	EffectEndTime        time.Time `xorm:"comment('有效期止') DATETIME"`
+	AuditProcessNote     string    `xorm:"comment('办理过程备注') VARCHAR(100)"`
+	AuditDate            time.Time `xorm:"comment('审核日期') DATETIME"`
+	PayNotice            string    `xorm:"default '0' comment('交费通知') VARCHAR(2)"`
+	SupplierStatus       string    `xorm:"comment('供应商状态（null:正常，1中止，2终止）') VARCHAR(255)"`
+	MgrType              string    `xorm:"comment('供应商管理类型') VARCHAR(255)"`
+	Type                 string    `xorm:"comment('供应商类型') VARCHAR(255)"`
+	MgrUnit              string    `xorm:"comment('管理单位') VARCHAR(255)"`
+	AddinTime            string    `xorm:"comment('准入日期') VARCHAR(255)"`
+	EffectTime           string    `xorm:"comment('生效日期') VARCHAR(255)"`
+	ApplyTime            time.Time `xorm:"comment('年审日期') DATETIME"`
+	SupplierNo           string    `xorm:"comment('供应商准入证编号') VARCHAR(255)"`
+	MdmFlag              string    `xorm:"default '0' comment('MDM标志') VARCHAR(2)"`
+	InternalFlag         string    `xorm:"comment('国内采购') VARCHAR(255)"`
+	ImportFlag           string    `xorm:"comment('进口采购') VARCHAR(255)"`
+	OutsideFlog          string    `xorm:"comment('境外项目') VARCHAR(255)"`
+	Remark               string    `xorm:"comment('备注') VARCHAR(500)"`
+	ThirdAudit           string    `xorm:"comment('备注') VARCHAR(500)"`
+	IsDelete             int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
+}

src/dashoo.cn/backend/api/business/oilsupplier/qualchange/qualchangeService.go

@@ -3,7 +3,6 @@ package qualchange
 import (
 	"dashoo.cn/backend/api/business/auditsetting"
 	"dashoo.cn/backend/api/business/oilsupplier/classorgsetting"
-	"dashoo.cn/backend/api/business/oilsupplier/supplier"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercertsub"
 	"dashoo.cn/backend/api/business/workflow"
@@ -29,7 +28,7 @@ func GetQualChangeService(xormEngine *xorm.Engine) *QualChangeService {
 }
 
 //获取资质列表
-func (s *QualChangeService) GetQualPagingEntitiesWithOrderBytbl(supname, supcername, supfilename, order, where string, pageIndex, itemsPerPage int64) (int64,[]supplier.OilSupplierView) {
+func (s *QualChangeService) GetQualPagingEntitiesWithOrderBytbl(supname, supcername, supfilename, qualmainname, order, where string, pageIndex, itemsPerPage int64) (int64,[]OilSupplierQual) {
 	var err error
 	var total int64
 	if where == "" {
@@ -37,15 +36,15 @@ func (s *QualChangeService) GetQualPagingEntitiesWithOrderBytbl(supname, supcern
 	}
 	//获取总记录数
 	sqlCount := `select count(*) from ` + supname + ` a 
-	left join ` + supcername + ` b on a.Id=b.SupplierId 
+	left join ` + supcername + ` b on a.Id=b.SupplierId left join `+ qualmainname + ` c on a.Id = c.SupplierId
 	where a.Id in ( select SupplierId from `+ supfilename +`) and `+ where
 	var sql string
-	sql = `select a.*, b.*, b.Id CertId from ` + supname + ` a  
-	left join ` + supcername + ` b on a.Id=b.SupplierId 
+	sql = `select a.*, b.AccessCardNo, b.Id CertId, c.Id  QualId, c.Status Status, c.Step Step, c.WorkFlowId WorkFlowId, c.CreateOn ConmmitTime from ` + supname + ` a  
+	left join ` + supcername + ` b on a.Id=b.SupplierId left join `+ qualmainname + ` c on a.Id = c.SupplierId
 	where a.Id in ( select SupplierId from `+ supfilename +`) and` + where + ` order by ` + order +
 		` limit ` + utils.ToStr((pageIndex-1)*itemsPerPage) + "," + utils.ToStr(itemsPerPage)
 
-	List := make([]supplier.OilSupplierView, 0)
+	List := make([]OilSupplierQual, 0)
 	utils.DBE.Sql(sql).Find(&List)
 
 	resultsSlice, err := s.DBE.Query(sqlCount)

src/dashoo.cn/backend/api/controllers/base.go

@@ -248,6 +248,8 @@ var (
 	OilSupplierOpinionName                   string = "OilSupplierOpinion"          //追加意见表
 	OilInfoChangeItemName                    string = "OilInfoChangeItem"           //信息变更表
 	OilInfoChangeName                        string = "OilInfoChange"               //信息变更表
+	OilQualChangeMainName                    string = "OilQualChangeMain"           //资质变更表
+	OilQualChangeDetailName                  string = "OilQualChangeDetail"         //资质变更表
 )
 
 //分页信息及数据

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

@@ -2,6 +2,7 @@ package oilsupplier
 
 import (
 	"dashoo.cn/backend/api/business/oilsupplier/qualchange"
+	"dashoo.cn/business2/permission"
 	"encoding/json"
 	"strconv"
 	"strings"
@@ -30,7 +31,8 @@ func (this *QualChangeController) GetEntityList() {
 
 	//获取分页信息
 	page := this.GetPageInfoForm()
-	where := " b.Status >= 7 "
+	where := " b.Status >= 1 "
+	//where := " b.Status >= 7 "
 	orderby := "a.CreateOn desc"
 	Order := this.GetString("Order")
 	Prop := this.GetString("Prop")
@@ -64,9 +66,21 @@ func (this *QualChangeController) GetEntityList() {
 		}
 	}
 
+	//企业用户必须加创建人条件
+	if this.User.IsCompanyUser == 1 {
+		where = where + " and a.CreateUserId = '" + this.User.Id + "'"
+	} else {
+		//超级管理员和有查看所有数据权限的用户不加条件
+		svcPerm :=permission.GetPermissionService(utils.DBE)
+		isauth := svcPerm.IsAuthorized(this.User.Id, "oil_supplier.marketAccess.AllRecord")
+		if !svcPerm.IsAdmin(this.User.Id) && !isauth {
+			where = where + " and a.CreateUserId = '" + this.User.Id + "'"
+		}
+	}
+
 	svc := qualchange.GetQualChangeService(utils.DBE)
-	var list []supplier.OilSupplierView
-	total, list:= svc.GetQualPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertName, OilSupplierFileName, orderby, where, page.CurrentPage, page.Size)
+	var list []qualchange.OilSupplierQual
+	total, list:= svc.GetQualPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertName, OilSupplierFileName, OilQualChangeMainName, orderby, where, page.CurrentPage, page.Size)
 	var datainfo DataInfo
 	datainfo.Items = list
 	datainfo.CurrentItemCount = total

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

@@ -117,7 +117,7 @@
           v-if="this.formData.Status != '2' && this.formData.Status != '4' && this.formData.Status !== '5' ">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
             default-first-option>
-            <el-option v-for="item in secauditerOptions" :key="item.userid" :label="item.username" :value="item.userid">
+            <el-option v-for="item in secauditerOptions" :key="item.id" :label="item.realname" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>

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

@@ -124,7 +124,7 @@
           v-if="this.formData.Status != '2' && this.formData.Status != '4' && this.formData.Status !== '5' ">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
             default-first-option>
-            <el-option v-for="item in secauditerOptions" :key="item.userid" :label="item.username" :value="item.userid">
+            <el-option v-for="item in secauditerOptions" :key="item.id" :label="item.realname" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>

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

@@ -123,7 +123,7 @@
           v-if="this.formData.Status != '2' && this.formData.Status != '4' && this.formData.Status !== '5' ">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
             default-first-option>
-            <el-option v-for="item in secauditerOptions" :key="item.userid" :label="item.username" :value="item.userid">
+            <el-option v-for="item in secauditerOptions" :key="item.id" :label="item.realname" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/auditoperation.vue

@@ -216,7 +216,7 @@
         <el-form-item label="审批人">
           <el-select ref="selectAuditer" v-model="ProfAuditThen" placeholder="请选择" style="width: 100%" filterable
             allow-create default-first-option>
-            <el-option v-for="item in secauditerOptions" :key="item.userid" :label="item.username" :value="item.userid">
+            <el-option v-for="item in secauditerOptions" :key="item.id" :label="item.realname" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/annualfistaudit.vue

@@ -444,6 +444,8 @@
       jstimehandle(val) {
         if (val === '') {
           return '----'
+        } else if (val === '0001-01-01T00:00:00Z') {
+          return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
           return '----'
         } else if (val === '5000-01-01T23:59:59+08:00') {

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

@@ -554,6 +554,8 @@
       jstimehandle(val) {
         if (val === '') {
           return '----'
+        } else if (val === '0001-01-01T00:00:00Z') {
+          return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
           return '----'
         } else if (val === '5000-01-01T23:59:59+08:00') {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochange/_opera/operation.vue

@@ -11,7 +11,7 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
-          <el-button type="primary" size="mini" @click="submitInfoChange">提交申请</el-button>
+          <el-button type="primary" size="mini" @click="submitInfoChange" v-if="(InfoStatus == 0 || InfoStatus == '') && !butnab">提交申请</el-button>
           <router-link :to="'/oilsupplier/infochange'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
@@ -463,12 +463,12 @@
       <el-card>
         <div slot="header" class="clearfix" style="height:10px">
           <span style="font-weight:bold;">信息变更</span>
-          <el-button style="float: right;" size="mini" type="primary" @click="addchange">添加变更</el-button>
+          <el-button style="float: right;" size="mini" type="primary" @click="addchange" :disabled="butnab">添加变更</el-button>
         </div>
         <el-table :data="InfoData" border style="width: 100%">
           <el-table-column label="操作" min-width="90" align="center" fixed>
             <template slot-scope="scope">
-              <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
+              <el-button type="primary" size="mini" @click="deleteEntity(scope.row)" :disabled="butnab">删除</el-button>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="SelectItemName" label="变更项目">
@@ -631,12 +631,18 @@
             message: '请选择审批人',
             trigger: 'blur'
           }]
-        }
+        },
+        InfoStatus: '',
+        butnab: false,
       }
     },
     created() {
       this.serviceId = this.$route.params.opera
       this.supplierId = this.serviceId
+      this.InfoStatus = this.$route.query.InfoStatus
+      if (this.InfoStatus != 0){
+        this.butnab = true
+      }
       this.initDatas()
     },
     methods: {
@@ -768,6 +774,7 @@
             // 保存成功后，初始化数据，变成修改
             this.initDatas()
             this.commitshow = false
+            this.butnab = true
             this.$message({
               type: 'success',
               message: res.data.message

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

@@ -39,7 +39,7 @@
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" min-width="90" align="center" fixed>
           <template slot-scope="scope">
-            <router-link :to="'/oilsupplier/infochange/' + scope.row.Id + '/operation'">
+            <router-link :to="'/oilsupplier/infochange/' + scope.row.Id + '/operation?InfoStatus='+ scope.row.Status">
               <el-button type="primary" plain title="编辑" size="mini">编辑</el-button>
             </router-link>
           </template>
@@ -67,9 +67,9 @@
             </el-alert>
           </template> 
         </el-table-column>
-        <el-table-column prop="CreateOn" sortable min-width="100" label="申请日期" align="center" show-overflow-tooltip>
+        <el-table-column prop="ConmmitTime" sortable min-width="100" label="申请日期" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ jstimehandle(scope.row.CreateOn+'') }}
+            {{ jstimehandle(scope.row.ConmmitTime+'') }}
           </template>
         </el-table-column>
       </el-table>
@@ -388,6 +388,8 @@
       jstimehandle(val) {
         if (val === '') {
           return '----'
+        } else if (val === '0001-01-01T00:00:00Z') {
+          return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
           return '----'
         } else if (val === '5000-01-01T23:59:59+08:00') {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/qualchange/_opera/operation.vue

@@ -11,7 +11,7 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
-          <el-button type="primary" size="mini" @click="submitqualChange">提交申请</el-button>
+          <el-button type="primary" size="mini" @click="submitqualChange" v-if="(QualStatus == 0 || QualStatus == '') && !butnab">提交申请</el-button>
           <router-link :to="'/oilsupplier/qualchange'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
@@ -22,14 +22,10 @@
         <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
         <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
       </el-table>
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
-        :total="currentItemCount">
-      </el-pagination>
     </el-card>
     <el-card class="box-card" style="margin-top: 10px;">
       <div slot="header" class="clearfix">
-        <span style="font-weight: bold">分类文档</span>
+        <span style="font-weight: bold">企业资质</span>
       </div>
       <!-- <subfile-list ref="subfileList" :data="subfileList" :SupplierId="SupplierId" :SupplierCertId="SupplierCertId"
         :SupplierTypeCode="SupplierTypeCode" :businessList="businessList" :BusinessForm="BusinessForm" height="360px"
@@ -42,14 +38,19 @@
         </template>
       </el-table-column>
       <el-table-column prop="NeedFileType" label="文件分类" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="FileName" label="文件名称" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="EffectDate" label="有效日期" show-overflow-tooltip>
+      <el-table-column prop="FileName" label="原文件" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="EffectDate" label="原有效日期" show-overflow-tooltip>
         <template slot-scope="scope">
           {{ jstimehandle(scope.row.EffectDate+'') }}
         </template>
       </el-table-column>
-      <el-table-column prop="OtherRemark" label="其他信息" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="Remark" label="备注信息" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="OtherRemark" label="变更后文件" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="EffectDate" label="变更后有效日期" show-overflow-tooltip>
+        <template slot-scope="scope">
+          {{ jstimehandle(scope.row.EffectDate+'') }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
     </el-table>
 
     <el-dialog :title="Title" :visible.sync="visible" top="5vh">
@@ -62,15 +63,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="备注信息">
+            <el-form-item label="描述">
               <el-input v-model="SubfileForm.Remark" type="textarea" :rows=3 placeholder="请输入备注信息"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="文档上传">
-              <el-upload style="margin-top: 10px;" multiple action="" :limit="1" ref="refuploadattach"
-                :http-request="uploadrequest" class="attach-uploader" :show-file-list="true"
-                :before-upload="beforeAvatarUpload">
+            <el-form-item label="资质文件">
+              <el-upload style="margin-top: 10px;" action="" ref="refuploadattach" :http-request="uploadrequest"
+                class="attach-uploader" :before-upload="beforeAvatarUpload">
                 <i class="el-icon-plus attach-uploader-icon"></i>
               </el-upload>
             </el-form-item>
@@ -100,6 +100,36 @@
       </div>
     </el-dialog>
     </el-card>
+     <!-- <el-dialog title="提交申请" :visible.sync="commitshow" width="360px">
+      <el-form label-width="90px" :model="entityForm" :rules="rules" ref="EntityFormref">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="审批单位" prop="FirstAudit" required>
+              <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
+                filterable @change="auditOrgChang" style="width: 100%" v-model="entityForm.FirstAudit"
+                placeholder="请选择组织"></el-cascader>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="审批人" prop="auditer" required>
+              <el-select ref="selectAuditer" v-model="entityForm.auditer" placeholder="请选择" style="width: 100%"
+                filterable allow-create default-first-option>
+               <el-option v-for="item in auditerOption" :key="item.id" :label="item.realname" :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span style="float: right;margin-top:-10px;">
+        <el-button size="small" @click="commitshow = false">取 消</el-button>
+        <el-button type="primary" size="small" @click="addInfoChangeAudit()">确 定</el-button>
+      </span>
+      <br>
+    </el-dialog> -->
+
   </div>
 </template>
 
@@ -166,6 +196,9 @@
 
         waituploads: [], // 等待上传的附件列表
         doclist: [],
+        QualStatus: '',
+        butnab: false,
+        commitshow: false,
       }
     },
     created() {
@@ -176,32 +209,35 @@
       if (this.$route.query.classId) {
         this.classId = this.$route.query.classId + ''
       }
+      this.QualStatus = this.$route.query.QualStatus
+      if (this.QualStatus > 0){
+        this.butnab = true
+      }
       this.SupplierId = this.serviceId
       this.SupplierTypeCode = this.classId
       this.SupplierCertId = this.certId
       console.log("---Id---", this.certId, this.serviceId)
       this.getDictOptions()
       this.initData()
+      this.getbusList()
     },
     methods: {
       initData() {
         let _this = this
         const params = {
-          SupplierCertId: this.SupplierCertId,
+          SupplierId: this.SupplierId,
           SupplierTypeCode: this.SupplierTypeCode,
-          _currentPage: this.currentPage,
-          _size: this.size,
+          _currentPage: 1,
+          _size: 1000,
         }
-        this.$axios.get('suppliercertsub/list', {
+        _this.$axios.get('supplierfile/filelist', {
             params
           })
           .then(res => {
-            _this.businessList = res.data.items
+            _this.subfileList = res.data.items
             _this.currentItemCount = res.data.currentItemCount
-            _this.initFileData()
           })
           .catch(err => {
-            // handle error
             console.error(err)
           })
       },
@@ -213,52 +249,25 @@
           console.error(err)
         })
       },
-      initFileData() {
+      getbusList() {
         let _this = this
         const params = {
-          SupplierId: this.SupplierId,
+          SupplierCertId: this.SupplierCertId,
           SupplierTypeCode: this.SupplierTypeCode,
           _currentPage: 1,
-          _size: 1000,
+          _size: 1000
         }
-        _this.$axios.get('supplierfile/filelist', {
+        this.$axios.get('suppliercertsub/list', {
             params
           })
           .then(res => {
-            _this.subfileList = res.data.items
-            _this.currentItemCount = res.data.currentItemCount
+            _this.businessList = res.data.items
           })
           .catch(err => {
-            // handle error
             console.error(err)
           })
       },
-      getCode() {
-        if (this.businessList && this.businessList.length > 0) {
-          for (var i = 0; i < this.businessList.length; i++) {
-            if (this.SubfileForm.SupplierCertSubId == this.businessList[i].Id) {
-              this.SubfileForm.CertSubName = this.businessList[i].Name
-            }
-          }
-        }
-      },
       makesure() {
-        if (this.Title == '新增文件') {
-          if (this.$refs.refuploadattach.uploadFiles && this.$refs.refuploadattach.uploadFiles.length > 0) {
-            // 上传附件是否完成判断
-            if (!this.attachissuccess()) {
-              this.$message.error('有附件未成功上传！不能保存数据')
-              return
-            }
-            this.getattachissuccess()
-            this.addSubfile()
-          } else {
-            this.$message({
-              type: 'warning',
-              message: '请上传文件！'
-            })
-          }
-        } else if (this.Title == '编辑文件') {
           if (this.$refs.refuploadattach.uploadFiles && this.$refs.refuploadattach.uploadFiles.length > 0) {
             // 上传附件是否完成判断
             if (!this.attachissuccess()) {
@@ -270,7 +279,6 @@
           } else {
             this.editSubfile()
           }
-        }
       },
       editSubfile() {
         let _this = this
@@ -284,8 +292,8 @@
                 message: res.data.message,
               })
               this.visible = false
-              this.initFileData()
-              this.$refs.refuploadattach = ''
+              this.initData()
+              this.$refs.refuploadattach.uploadFiles = []
             } else {
               _this.$message({
                 type: 'warning',
@@ -297,25 +305,6 @@
             console.error(err)
           })
       },
-      showDialog() {
-        this.Title = '新增文件'
-        this.SubfileForm.Id = ''
-        this.SubfileForm.SupplierId = this.SupplierId
-        this.SubfileForm.SupplierTypeCode = this.SupplierTypeCode
-        this.SubfileForm.SupplierCertSubId = ''
-        this.SubfileForm.CertSubName = ''
-        this.SubfileForm.NeedFileType = ''
-        this.SubfileForm.NeedFileCode = ''
-        this.SubfileForm.FileExt = ''
-        this.SubfileForm.FileType = ''
-        this.SubfileForm.FileName = ''
-        this.SubfileForm.EffectDate = new Date()
-        this.SubfileForm.FileUrl = ''
-        this.SubfileForm.OtherRemark = ''
-        this.SubfileForm.Remark = ''
-        this.SubfileForm.IsDelete = 0
-        this.visible = true
-      },
       openDialog(val) {
         this.Title = '编辑文件'
         this.SubfileForm.Id = val.Id
@@ -388,7 +377,7 @@
             })
           })
       },
-      // 判断附件是否上传成功
+     // 判断附件是否上传成功
       attachissuccess() {
         if (this.$refs.refuploadattach.uploadFiles && this.$refs.refuploadattach.uploadFiles.length > 0) {
           for (let i = 0; i < this.$refs.refuploadattach.uploadFiles.length; i++) {
@@ -430,8 +419,10 @@
           })
           .catch(() => {})
       },
-      submitqualChange() {
 
+      submitqualChange() {
+        this.getorgtreelist()
+        this.commitshow = true
       },
       jstimehandle(val) {
         if (val === '') {

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

@@ -39,7 +39,7 @@
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" min-width="90" align="center" fixed>
           <template slot-scope="scope">
-            <router-link :to="'/oilsupplier/qualchange/' + scope.row.Id + '/operation?certid=' + scope.row.CertId +'&classId='+ scope.row.SupplierTypeCode">
+            <router-link :to="'/oilsupplier/qualchange/' + scope.row.Id + '/operation?certid=' + scope.row.CertId +'&classId='+ scope.row.SupplierTypeCode +'&QualStatus='+scope.row.Status">
               <el-button type="primary" plain title="编辑" size="mini">编辑</el-button>
             </router-link>
           </template>
@@ -78,9 +78,9 @@
             </el-alert>
           </template>
         </el-table-column>
-        <el-table-column prop="CreateOn" sortable min-width="100" label="申请日期" align="center" show-overflow-tooltip>
+        <el-table-column prop="ConmmitTime" sortable min-width="100" label="申请日期" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ jstimehandle(scope.row.CreateOn+'') }}
+            {{ jstimehandle(scope.row.ConmmitTime+'') }}
           </template>
         </el-table-column>
       </el-table>
@@ -324,6 +324,8 @@
       jstimehandle(val) {
         if (val === '') {
           return '----'
+        } else if (val === '0001-01-01T00:00:00Z') {
+          return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
           return '----'
         } else if (val === '5000-01-01T23:59:59+08:00') {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/qualchange/qualaudit.vue

@@ -324,6 +324,8 @@
       jstimehandle(val) {
         if (val === '') {
           return '----'
+        } else if (val === '0001-01-01T00:00:00Z') {
+          return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
           return '----'
         } else if (val === '5000-01-01T23:59:59+08:00') {