前后:资质文件变更的描述

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

@@ -35,6 +35,37 @@ type OilQualChangeDetail struct {
 	ModifiedBy        string    `xorm:"VARCHAR(50)"`
 }
 
+type OilQualChangeDetail1 struct {
+	Id                int       `xorm:"not null default 0 INT(10)"`
+	SupplierId        int       `xorm:"INT(10)"`
+	SupplierCertId    int       `xorm:"not null comment('准入子表Id') INT(10)"`
+	FileId            int       `xorm:"not null comment('资质文件Id') INT(10)"`
+	ParentId          int       `xorm:"not null default 0 comment('主表Id') INT(10)"`
+	SupplierTypeCode  string    `xorm:"not null default '0' comment('准入类别代码（01 物资类，02 基建类，03 技术服务类）') VARCHAR(5)"`
+	SupplierCertSubId int       `xorm:"not null default 0 comment('供方对应准入子分类表') INT(10)"`
+	CertSubName       string    `xorm:"default '' comment('分类名称') VARCHAR(50)"`
+	NeedFileType      string    `xorm:"not null default '' comment('文件分类') VARCHAR(50)"`
+	NeedFileCode      string    `xorm:"not null default '' comment('文件分类编码') VARCHAR(20)"`
+	OldFileName       string    `xorm:"not null default '' comment('原文件名称') VARCHAR(2000)"`
+	FileName          string    `xorm:"not null default '' comment('文件名称') VARCHAR(2000)"`
+	FileExt           string    `xorm:"VARCHAR(10)"`
+	FileType          int       `xorm:"default 0 comment('0：不必要文件；1:必上传文件；') INT(10)"`
+	OldEffectDate     time.Time `xorm:"comment('原有效期') DATETIME"`
+	EffectDate        time.Time `xorm:"comment('有效期') DATETIME"`
+	OldFileUrl        string    `xorm:"VARCHAR(2000)"`
+	FileUrl           string    `xorm:"VARCHAR(2000)"`
+	OtherRemark       string    `xorm:"VARCHAR(500)"`
+	Remark            string    `xorm:"comment('备注') VARCHAR(500)"`
+	Remark1           string    `xorm:"comment('备注') VARCHAR(500)"`
+	IsDelete          int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
+	CreateOn          time.Time `xorm:"DATETIME"`
+	CreateUserId      int       `xorm:"INT(10)"`
+	CreateBy          string    `xorm:"VARCHAR(50)"`
+	ModifiedOn        time.Time `xorm:"DATETIME"`
+	ModifiedUserId    int       `xorm:"INT(10)"`
+	ModifiedBy        string    `xorm:"VARCHAR(50)"`
+}
+
 type OilQualChangeMain struct {
 	Id             int       `xorm:"not null pk autoincr INT(10)"`
 	SupplierId     int       `xorm:"not null comment('供方基本信息表主键') INT(10)"`

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

@@ -162,7 +162,7 @@ func (s *QualChangeService) GetQualPagingEntities(FileName, qualChangeName strin
 	sql = `select a.Id Id, a.SupplierId SupplierId, a.SupplierTypeCode SupplierTypeCode, a.SupplierCertSubId SupplierCertSubId, a.CertSubName CertSubName, a.OtherRemark Remark,`
 	sql += ` a.NeedFileType NeedFileType, a.NeedFileCode NeedFileCode, a.FileExt FileExt, a.FileType FileType, `
 	sql += ` a.EffectDate OldEffectDate, a.FileUrl OldFileUrl, a.FileName OldFileName, `
-	sql += ` b.EffectDate EffectDate, b.FileUrl FileUrl, b.FileName FileName, b.ParentId, a.IsDelete `
+	sql += ` b.EffectDate EffectDate, b.FileUrl FileUrl, b.FileName FileName, b.ParentId,b.Remark Remark1, a.IsDelete `
 	sql += ` from ` + FileName + ` a `
 	if MInfoId != "" {
 		sql += ` left join ` + qualChangeName + " b on b.FileId = a.Id AND b.ParentId =" + MInfoId

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

@@ -89,4 +89,35 @@ type OilAppendChangeDetail struct {
 	ModifiedOn        time.Time `xorm:"DATETIME"`
 	ModifiedUserId    int       `xorm:"INT(10)"`
 	ModifiedBy        string    `xorm:"VARCHAR(50)"`
+}
+
+type OilAppendChangeDetail1 struct {
+	Id                int       `xorm:"not null default 0 INT(10)"`
+	SupplierId        int       `xorm:"INT(10)"`
+	SupplierCertId    int       `xorm:"not null comment('准入子表Id') INT(10)"`
+	FileId            int       `xorm:"not null comment('资质文件Id') INT(10)"`
+	ParentId          int       `xorm:"not null default 0 comment('主表Id') INT(10)"`
+	SupplierTypeCode  string    `xorm:"not null default '0' comment('准入类别代码（01 物资类，02 基建类，03 技术服务类）') VARCHAR(5)"`
+	SupplierCertSubId int       `xorm:"not null default 0 comment('供方对应准入子分类表') INT(10)"`
+	CertSubName       string    `xorm:"default '' comment('分类名称') VARCHAR(50)"`
+	NeedFileType      string    `xorm:"not null default '' comment('文件分类') VARCHAR(50)"`
+	NeedFileCode      string    `xorm:"not null default '' comment('文件分类编码') VARCHAR(20)"`
+	OldFileName       string    `xorm:"not null default '' comment('原文件名称') VARCHAR(2000)"`
+	FileName          string    `xorm:"not null default '' comment('文件名称') VARCHAR(2000)"`
+	FileExt           string    `xorm:"VARCHAR(10)"`
+	FileType          int       `xorm:"default 0 comment('0：不必要文件；1:必上传文件；') INT(10)"`
+	OldEffectDate     time.Time `xorm:"comment('原有效期') DATETIME"`
+	EffectDate        time.Time `xorm:"comment('有效期') DATETIME"`
+	OldFileUrl        string    `xorm:"VARCHAR(2000)"`
+	FileUrl           string    `xorm:"VARCHAR(2000)"`
+	OtherRemark       string    `xorm:"VARCHAR(500)"`
+	Remark            string    `xorm:"comment('备注') VARCHAR(500)"`
+	Remark1           string    `xorm:"comment('备注') VARCHAR(500)"`
+	IsDelete          int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
+	CreateOn          time.Time `xorm:"DATETIME"`
+	CreateUserId      int       `xorm:"INT(10)"`
+	CreateBy          string    `xorm:"VARCHAR(50)"`
+	ModifiedOn        time.Time `xorm:"DATETIME"`
+	ModifiedUserId    int       `xorm:"INT(10)"`
+	ModifiedBy        string    `xorm:"VARCHAR(50)"`
 }

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

@@ -25,10 +25,10 @@ func (s *OilSupplierCertAppendSubService) GetQualPagingEntities(FileName, qualCh
 	sqlCount += ` where ` + where
 
 	var sql string
-	sql = `select a.Id Id, a.SupplierId SupplierId, a.SupplierTypeCode SupplierTypeCode, a.SupplierCertSubId SupplierCertSubId, a.CertSubName CertSubName, `
+	sql = `select a.Id Id, a.SupplierId SupplierId, a.SupplierTypeCode SupplierTypeCode, a.SupplierCertSubId SupplierCertSubId, a.CertSubName CertSubName,a.OtherRemark Remark, `
 	sql += ` a.NeedFileType NeedFileType, a.NeedFileCode NeedFileCode, a.FileExt FileExt, a.FileType FileType, `
 	sql += ` a.EffectDate OldEffectDate, a.FileUrl OldFileUrl, a.FileName OldFileName, `
-	sql += ` b.EffectDate EffectDate, b.FileUrl FileUrl, b.FileName FileName, b.ParentId, a.IsDelete `
+	sql += ` b.EffectDate EffectDate, b.FileUrl FileUrl, b.FileName FileName, b.ParentId, b.OtherRemark Remark1, a.IsDelete `
 	sql += ` from ` + FileName + ` a `
 	if MInfoId != "" {
 		sql += ` left join ` + qualChangeName + " b on b.FileId = a.Id AND b.ParentId =" + MInfoId

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

@@ -1626,7 +1626,7 @@ func (this *AnnualAuditController) updatesupplier(supname string, suppid int, in
 // @router /filelist [get]
 func (this *AnnualAuditController) FileList() {
 	page := this.GetPageInfoForm()
-	var list []qualchange.OilQualChangeDetail
+	var list []qualchange.OilQualChangeDetail1
 	svc := qualchange.GetQualChangeService(utils.DBE)
 	where := " 1=1 and a.IsDelete = 0"
 	orderby := "a.Id"

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

@@ -252,11 +252,11 @@ func (this *QualChangeController) AddQualMain() {
 // @router /auditfilelist [get]
 func (this *QualChangeController) AuditFileList() {
 	page := this.GetPageInfoForm()
-	var list []qualchange.OilQualChangeDetail
+	var list []qualchange.OilQualChangeDetail1
 	svc := qualchange.GetQualChangeService(utils.DBE)
 	where := " 1=1"
 	orderby := "a.Id"
-	asc := false
+	asc := true
 	Order := this.GetString("Order")
 	Prop := this.GetString("Prop")
 	if Order != "" && Prop != "" {

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

@@ -1010,7 +1010,7 @@ func (this *OilSupplierCertAppendSubController) AddInfoChangeItemCh() {
 // @router /filelist [get]
 func (this *OilSupplierCertAppendSubController) FileList() {
 	page := this.GetPageInfoForm()
-	var list []suppliercertappendsub.OilAppendChangeDetail
+	var list []suppliercertappendsub.OilAppendChangeDetail1
 	svc := suppliercertappendsub.GetOilSupplierCertAppendSubService(utils.DBE)
 	where := " 1=1"
 	orderby := "a.Id"

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

@@ -503,7 +503,11 @@
                     {{ jstimehandle(scope.row.EffectDate+'') }}
                   </template>
                 </el-table-column>
-                <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="Remark" label="描述" show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    {{ getRemark(scope.row.Remark, scope.row.Remark1) }}
+                  </template>
+                </el-table-column>
               </el-table>
             </el-card>
             <el-card class="box-card" style="margin-top: 10px; margin-bottom: 10px">
@@ -2287,6 +2291,12 @@
         this.currentPage = 1
         this.initData()
       },
+      getRemark (remark, remark1) {
+        if (remark1 !== '') {
+          return remark1
+        }
+        return remark
+      },
       jstimehandle (val) {
         if (val === '') {
           return '----'

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

@@ -573,7 +573,11 @@
                     {{ jstimehandle(scope.row.EffectDate+'') }}
                   </template>
                 </el-table-column>
-                <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="Remark" label="描述" show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    {{ getRemark(scope.row.Remark, scope.row.Remark1) }}
+                  </template>
+                </el-table-column>
               </el-table>
             </el-card>
             <el-card class="box-card" style="margin-top: 10px; margin-bottom: 10px">
@@ -2440,7 +2444,12 @@
         this.currentPage = 1
         this.initData()
       },
-
+      getRemark (remark, remark1) {
+        if (remark1 !== '') {
+          return remark1
+        }
+        return remark
+      },
       jstimehandle (val) {
         if (val === '') {
           return '----'

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

@@ -487,7 +487,11 @@
                     {{ jstimehandle(scope.row.EffectDate+'') }}
                   </template>
                 </el-table-column>
-                <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="Remark" label="描述" show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    {{ getRemark(scope.row.Remark, scope.row.Remark1) }}
+                  </template>
+                </el-table-column>
               </el-table>
             </el-card>
             <el-card class="box-card" style="margin-top: 10px; margin-bottom: 10px">
@@ -2283,7 +2287,12 @@
         this.currentPage = 1
         this.getSortList()
       },
-
+      getRemark (remark, remark1) {
+        if (remark1 !== '') {
+          return remark1
+        }
+        return remark
+      },
       jstimehandle (val) {
         if (val === '') {
           return '----'

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

@@ -749,7 +749,11 @@
                   {{ jstimehandle(scope.row.EffectDate+'') }}
                 </template>
               </el-table-column>
-              <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="Remark" label="描述" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{ getRemark(scope.row.Remark, scope.row.Remark1) }}
+                </template>
+              </el-table-column>
             </el-table>
 
             <el-pagination small
@@ -2821,7 +2825,12 @@ export default {
             console.error(err)
           })
       },
-
+      getRemark (remark, remark1) {
+        if (remark1 !== '') {
+          return remark1
+        }
+        return remark
+      },
       jstimehandle (val) {
         if (val === '') {
           return '----'

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

@@ -665,7 +665,11 @@
                   {{ jstimehandle(scope.row.EffectDate+'') }}
                 </template>
               </el-table-column>
-              <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="Remark" label="描述" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{ getRemark(scope.row.Remark, scope.row.Remark1) }}
+                </template>
+              </el-table-column>
             </el-table>
 
             <el-pagination small
@@ -2590,7 +2594,12 @@
             this.loading = false
           })
       },
-
+      getRemark (remark, remark1) {
+        if (remark1 !== '') {
+          return remark1
+        }
+        return remark
+      },
       jstimehandle (val) {
         if (val === '') {
           return '----'

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

@@ -697,7 +697,11 @@
                   {{ jstimehandle(scope.row.EffectDate+'') }}
                 </template>
               </el-table-column>
-              <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="Remark" label="描述" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{ getRemark(scope.row.Remark, scope.row.Remark1) }}
+                </template>
+              </el-table-column>
             </el-table>
 
             <el-pagination small
@@ -3280,6 +3284,12 @@ import Viewer from 'v-viewer'
       nexStepCB () {
         this.Step += 1
       },
+      getRemark (remark, remark1) {
+        if (remark1 !== '') {
+          return remark1
+        }
+        return remark
+      },
       jstimehandle (val) {
         if (val === '') {
           return '----'

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

@@ -837,7 +837,11 @@
                   {{ jstimehandle(scope.row.EffectDate+'') }}
                 </template>
               </el-table-column>
-              <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="Remark" label="描述" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{ getRemark(scope.row.Remark, scope.row.Remark1) }}
+                </template>
+              </el-table-column>
             </el-table>
 
             <el-pagination small
@@ -3418,6 +3422,12 @@
       nexStepCB () {
         this.Step += 1
       },
+      getRemark (remark, remark1) {
+        if (remark1 !== '') {
+          return remark1
+        }
+        return remark
+      },
       jstimehandle (val) {
         if (val === '') {
           return '----'

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

@@ -610,7 +610,11 @@
                   {{ jstimehandle(scope.row.EffectDate+'') }}
                 </template>
               </el-table-column>
-              <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="Remark" label="描述" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{ getRemark(scope.row.Remark, scope.row.Remark1) }}
+                </template>
+              </el-table-column>
             </el-table>
 
             <el-pagination small
@@ -3252,6 +3256,12 @@ import Viewer from 'v-viewer'
       nexStepCB () {
         this.Step += 1
       },
+      getRemark (remark, remark1) {
+        if (remark1 !== '') {
+          return remark1
+        }
+        return remark
+      },
       jstimehandle (val) {
         if (val === '') {
           return '----'

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

@@ -501,12 +501,6 @@
           </el-card>
         </el-tab-pane>
 
-
-        <el-tab-pane label="准入范围" :disabled="!certId">
-          <business-list ref="businessList" :data.sync="businessList" :canadd="false" height="360px"
-            style="margin-top: 20px"></business-list>
-        </el-tab-pane>
-
         <el-tab-pane label="企业资质" :disabled="!certId">
           <!--<subfile-list ref="subfileList" :data.sync="subfileList" :canadd="canadd" height="360px"-->
             <!--style="margin-top: 20px"></subfile-list>-->
@@ -590,7 +584,11 @@
                   {{ jstimehandle(scope.row.EffectDate+'') }}
                 </template>
               </el-table-column>
-              <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="Remark" label="描述" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{ getRemark(scope.row.Remark, scope.row.Remark1) }}
+                </template>
+              </el-table-column>
             </el-table>
 
             <el-pagination small
@@ -606,6 +604,10 @@
           </el-card>
         </el-tab-pane>
 
+        <el-tab-pane label="准入范围" :disabled="!certId">
+          <business-list ref="businessList" :data.sync="businessList" :canadd="false" height="360px"
+                         style="margin-top: 20px"></business-list>
+        </el-tab-pane>
 
         <el-tab-pane label="审批流程">
           <el-card class="box-card" >
@@ -2622,7 +2624,12 @@
             console.error(err)
           })
       },
-
+      getRemark (remark, remark1) {
+        if (remark1 !== '') {
+          return remark1
+        }
+        return remark
+      },
       jstimehandle (val) {
         if (val === '') {
           return '----'

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

@@ -495,7 +495,11 @@
                   {{ jstimehandle(scope.row.EffectDate+'') }}
                 </template>
               </el-table-column>
-              <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="Remark" label="描述" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{ getRemark(scope.row.Remark, scope.row.Remark1) }}
+                </template>
+              </el-table-column>
             </el-table>
 
             <el-pagination small
@@ -591,7 +595,11 @@
                   {{ jstimehandle(scope.row.EffectDate+'') }}
                 </template>
               </el-table-column>
-              <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="Remark" label="描述" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{ getRemark(scope.row.Remark, scope.row.Remark1) }}
+                </template>
+              </el-table-column>
             </el-table>
 
             <el-pagination small
@@ -687,7 +695,11 @@
                   {{ jstimehandle(scope.row.EffectDate+'') }}
                 </template>
               </el-table-column>
-              <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="Remark" label="描述" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{ getRemark(scope.row.Remark, scope.row.Remark1) }}
+                </template>
+              </el-table-column>
             </el-table>
 
             <el-pagination small
@@ -1888,6 +1900,12 @@
         this.currentPageProject = value
         this.getfilelist1()
       },
+      getRemark (remark, remark1) {
+        if (remark1 !== '') {
+          return remark1
+        }
+        return remark
+      },
       jstimehandle (val) {
         if (val === '') {
           return '----'

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

@@ -532,7 +532,11 @@
                     {{ jstimehandle(scope.row.EffectDate+'') }}
                   </template>
                 </el-table-column>
-                <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="Remark" label="描述" show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    {{ getRemark(scope.row.Remark, scope.row.Remark1) }}
+                  </template>
+                </el-table-column>
               </el-table>
             </el-card>
             <el-row :gutter="2">
@@ -3089,6 +3093,12 @@
           return val
         }
       },
+      getRemark (remark, remark1) {
+        if (remark1 !== '') {
+          return remark1
+        }
+        return remark
+      },
       jstimehandle (val) {
         if (val === '') {
           return '----'

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

@@ -578,7 +578,11 @@
                     {{ jstimehandle(scope.row.EffectDate+'') }}
                   </template>
                 </el-table-column>
-                <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="Remark" label="描述" show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    {{ getRemark(scope.row.Remark, scope.row.Remark1) }}
+                  </template>
+                </el-table-column>
               </el-table>
             </el-card>
             <!-- 增项分类列表 -->
@@ -3517,6 +3521,12 @@
           return val
         }
       },
+      getRemark (remark, remark1) {
+        if (remark1 !== '') {
+          return remark1
+        }
+        return remark
+      },
       jstimehandle (val) {
         if (val === '') {
           return '----'

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

@@ -537,7 +537,11 @@
                     {{ jstimehandle(scope.row.EffectDate+'') }}
                   </template>
                 </el-table-column>
-                <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="Remark" label="描述" show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    {{ getRemark(scope.row.Remark, scope.row.Remark1) }}
+                  </template>
+                </el-table-column>
               </el-table>
             </el-card>
             <!-- 增项分类列表 -->
@@ -3150,6 +3154,12 @@
           return val
         }
       },
+      getRemark (remark, remark1) {
+        if (remark1 !== '') {
+          return remark1
+        }
+        return remark
+      },
       jstimehandle (val) {
         if (val === '') {
           return '----'