前后:增项检查资质页面

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

@@ -504,6 +504,6 @@ func (s *OilSupplierService) GetDeleteSub2(TableName, where string , entitiesPtr
 	} else {
 		sql += ` left join ` + TableName + ` b on b.ClassId = a.SubClassId`
 	}
-	sql += " set IsQuestion = 2, LackFile = concat(IFNULL(LackFile,''),',','" + name + "') where IsQuestion != 2 and " + where
+	sql += " set IsQuestion = 2, LackFile = concat(IFNULL(LackFile,''),',','" + name + "') where " + where
 	s.DBE.SQL(sql).Find(entitiesPtr)
 }

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

@@ -66,5 +66,7 @@ type CheckFile struct {
 	CertId            string
 	SupplierId        int
 	Grade        	  string
+	CurrentPage       int64
+	Size        	  int64
 	Table        	  int 	"1准入,2增项,3年审,4信息变更"
 }

src/dashoo.cn/backend/api/conf/app.conf

@@ -68,7 +68,7 @@ reviewServiceUrl=http://weed1.labsop.cn:9390/4,04bd0e8e219881
 reviewBasisUrl=http://weed1.labsop.cn:9390/6,03b041cda73303
 contractSumScoreUrl=http://weed1.labsop.cn:9390/3,04b52a0cbe710e
 ServiceSumScoreUrl=http://weed1.labsop.cn:9390/1,036a3addb41d61
-GoodsSumScoreUrl=http://weed1.labsop.cn:9390/3,036a40af17839b
+GoodsSumScoreUrl=http://weed1.labsop.cn:9390/1,04f468ac70e35b
 
 goodsModuleHost=http://weed1.labsop.cn:9390/6,387ef1cde26d
 basisModuleHost=http://weed1.labsop.cn:9390/4,387f41329d9c

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

@@ -2897,7 +2897,7 @@ func (this *OilSupplierController) CheckSupplierFileNew() {
 		filesvc.GetEntityByWhere("OilSupplierFile", where1, &fileist1)
 
 		if !strings.Contains(companyHasHeaders, needHeader.FileName+",") {
-			errinfo.Message = "请上传！" + needHeader.FileName + "!"
+			errinfo.Message = "请上传！" + needHeader.FileName + "!详情请点击检查资质按钮查看!"
 			errinfo.Code = 0
 			this.Data["json"] = &errinfo
 			this.ServeJSON()
@@ -2910,7 +2910,7 @@ func (this *OilSupplierController) CheckSupplierFileNew() {
 				svc2.GetEntityByWhere("OilAnnualChangeDetail", where2, &filelist2)
 				if filelist2.FileName == "" && fileist1.FileName == "" {
 					//缺少的资质
-					errinfo.Message = "请上传！" + needHeader.FileName + "!"
+					errinfo.Message = "请上传！" + needHeader.FileName + "!详情请点击检查资质按钮查看!"
 					errinfo.Code = 0
 					this.Data["json"] = &errinfo
 					this.ServeJSON()
@@ -2924,7 +2924,7 @@ func (this *OilSupplierController) CheckSupplierFileNew() {
 				svc2.GetEntityByWhere("OilAppendChangeDetail", where2, &filelist2)
 				if filelist2.FileName == "" && fileist1.FileName == "" {
 					//缺少的资质
-					errinfo.Message = "请上传！" + needHeader.FileName + "!"
+					errinfo.Message = "请上传！" + needHeader.FileName + "!详情请点击检查资质按钮查看!"
 					errinfo.Code = 0
 					this.Data["json"] = &errinfo
 					this.ServeJSON()
@@ -3248,9 +3248,12 @@ func (this *OilSupplierController) CheckSupplierFileList() {
 	}
 
 	var certSubList1 []suppliercertsub.OilSupplierCertSub
-	certsubService.GetEntitysByWhere(OilSupplierCertSubName, "IsQuestion = 2 and SupplierId = " + strconv.Itoa(supplierEntity.Id) + " and SupplierCertId = " + file.CertId, &certSubList1)
+	total := certsubService.GetPagingEntitiesWithOrderBytbl("", file.CurrentPage, file.Size,"Id", true, &certSubList1, "IsQuestion = 2 and SupplierId = " + strconv.Itoa(supplierEntity.Id) + " and SupplierCertId = " + file.CertId)
 
 	var datainfo DataInfo
+	datainfo.CurrentItemCount = total
+	datainfo.PageIndex = file.CurrentPage
+	datainfo.ItemsPerPage = file.Size
 	datainfo.Items = certSubList1
 	this.Data["json"] = &datainfo
 	this.ServeJSON()

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

@@ -4,7 +4,7 @@
       <el-card class="box-card" style="height: calc(100vh - 115px);">
         <el-table :data="subList" border height="calc(100vh - 243px)" size="mini" style="width: 100%" v-loading="tableLoading" highlight-current-row @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55"></el-table-column>
-          <el-table-column label="操作" width="180" align="center" fixed="right">
+          <el-table-column label="操作" width="90" align="center" fixed="right">
             <template slot-scope="scope">
                <el-button type="primary" title="删除" size="mini" plain @click="deleteData(scope.row.Id)">删除</el-button>
             </template>
@@ -14,7 +14,7 @@
               <span>{{scope.$index+(currentPage - 1) * size + 1}} </span>
             </template>
           </el-table-column>
-          <el-table-column prop="Name" label="准入范围" width="130" align="center" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="Name" label="准入范围" width="250" align="center" show-overflow-tooltip></el-table-column>
           <el-table-column prop="LackFile" label="缺少资质" min-width="100" align="center" show-overflow-tooltip>
             <template slot-scope="scope">
               <span>{{trimString(scope.row.LackFile)}} </span>
@@ -70,6 +70,8 @@ export default {
   },
   methods: {
     getValue (supplierId, certId, operType) {
+      this.currentPage = 1
+      this.size = 10
       this.certId = certId
       this.operType = operType
       this.supplierId = supplierId
@@ -79,12 +81,15 @@ export default {
       if (this.certId) {
         this.tableLoading = true
         let fileType = {
+          currentPage: this.currentPage,
+          size: this.size,
           Type: this.operType,
           SupplierId: this.supplierId,
           CertId: this.certId.toString()
         }
         api.checkSupplierFileList(fileType, this.$axios).then(res => {
           this.subList = res.data.items
+          this.currentItemCount = res.data.currentItemCount
           this.tableLoading = false
         }).catch(err => {
           console.error(err)
@@ -93,6 +98,11 @@ export default {
     },
     deleteList () {
 
+    },
+    fatherMethod () {
+      console.log( this.$parent, ' this.$parent')
+      this.$parent.getSortList()
+      this.$parent.getMySortList()
     },
     trimString (val) {
       return val.substr(1)
@@ -133,6 +143,7 @@ export default {
                 delload.close()
                 _this.Ids = []
                 _this.initData()
+                _this.fatherMethod()
               } else {
                 delload.close()
                 _this.Ids = []

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

@@ -27,6 +27,9 @@
           <el-button type="primary" size="mini" style="margin-left: 8px"
                      v-if="formData.Id != '' && currentStatus <= 0" @click="saveinfochange">保存
           </el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px"
+                      v-if="formData.Id !='' && currentStatus <= 0" @click="checkFileList">检查资质
+          </el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick"
             v-if="formData.Id != '' && currentStatus <= 0 && parseInt(IsCompanyUser) === 0">提交审核
           </el-button>
@@ -1032,6 +1035,8 @@
         <el-button type="primary" @click="makeNewSure()">确 定</el-button>
       </div>
     </el-dialog>
+
+    <check-file ref="checkFile"></check-file>
   </div>
 </template>
 
@@ -1053,6 +1058,8 @@
   import PerformanceList from '@/components/oilsupplier/performancelist'
   import PatentList from '@/components/oilsupplier/patentlist'
   import WinningList from '@/components/oilsupplier/winninglist'
+  import CheckFile from '@/components/oilsupplier/checkFile'
+
   // v-viewer
   import Vue from 'vue'
   import Viewer from 'v-viewer'
@@ -1067,6 +1074,7 @@
     components: {
       WfMultiHistory,
       ChooseAuditor,
+      CheckFile,
       EquipmentList, // 企业主要设备
       PerformanceList, // 近三年主要业绩列表
       PatentList, // 专利及专有技术列表
@@ -2838,6 +2846,10 @@
       itemsshow () {
         this.myitemsshow = true
       },
+      checkFileList () {
+        this.$refs.checkFile.checkFileListShow = true
+        this.$refs.checkFile.getValue(this.formData.SupplierId, this.formData.SupplierCertId, this.supplierData.OperType === '制造商' ? 1 : 2)
+      },
       // 保存信息变更数据
       saveinfochange (val) {
         this.$refs['supplierData'].validate((valid) => {

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

@@ -26,6 +26,7 @@
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Id !='' && currentStatus <= 0" @click="saveinfochange">保存
           </el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Id !='' && currentStatus <= 0" @click="checkFileList">检查资质</el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick"
             v-if="formData.Id !='' && currentStatus <= 0 && IsCompanyUser == 0">提交审核
           </el-button>
@@ -1184,10 +1185,10 @@
 
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
       :visible="chooseAuditorVisible"></choose-auditor>
-      <choose-auditor-fen ref="chooseAuditorFen" @close="setAuditerFen" @hideChooseAuditer="chooseAuditorVisibleFen=false"
+    <choose-auditor-fen ref="chooseAuditorFen" @close="setAuditerFen" @hideChooseAuditer="chooseAuditorVisibleFen=false"
       :visible="chooseAuditorVisibleFen" typeCode="01"></choose-auditor-fen>
 
-      <el-dialog title="新增资质" :close-on-click-modal="false" :visible.sync="newVisible" top="5vh">
+    <el-dialog title="新增资质" :close-on-click-modal="false" :visible.sync="newVisible" top="5vh">
       <el-form ref="newSubfileForm" :model="newSubfileForm" label-width="100px" :rules="rules">
         <el-row>
           <el-col :span="12">
@@ -1226,7 +1227,10 @@
         <el-button type="primary" @click="makeNewSure()">确 定</el-button>
       </div>
     </el-dialog>
-    </div>
+
+    <check-file ref="checkFile"></check-file>
+
+  </div>
 </template>
 
 <script>
@@ -1248,6 +1252,7 @@
   import PerformanceList from '@/components/oilsupplier/performancelist'
   import PatentList from '@/components/oilsupplier/patentlist'
   import WinningList from '@/components/oilsupplier/winninglist'
+  import CheckFile from '@/components/oilsupplier/checkFile'
 
   // v-viewer
   import Vue from 'vue'
@@ -1263,6 +1268,7 @@
     components: {
       WfMultiHistory,
       ChooseAuditor,
+      CheckFile,
       EquipmentList, // 企业主要设备
       PerformanceList, // 近三年主要业绩列表
       PatentList, // 专利及专有技术列表
@@ -2016,6 +2022,10 @@
       // this.getsubfile()
     },
     methods: {
+      checkFileList () {
+        this.$refs.checkFile.checkFileListShow = true
+        this.$refs.checkFile.getValue(this.formData.SupplierId, this.formData.SupplierCertId, this.supplierData.OperType === '制造商' ? 1 : 2)
+      },
       equipmentdialog () {
         this.$refs['equipmentList'].showDialog()
       },

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

@@ -27,9 +27,9 @@
           <el-button type="primary" size="mini" style="margin-left: 8px"
                      v-if="formData.Id !='' && currentStatus <= 0" @click="saveinfochange">保存
           </el-button>
-<!--          <el-button type="primary" size="mini" style="margin-left: 8px"-->
-<!--                     v-if="formData.Id !='' && currentStatus <= 0" @click="checkFileList">检查资质-->
-<!--          </el-button>-->
+          <el-button type="primary" size="mini" style="margin-left: 8px"
+                     v-if="formData.Id !='' && currentStatus <= 0" @click="checkFileList">检查资质
+          </el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick"
             v-if="formData.Id !='' && currentStatus <= 0 && IsCompanyUser == 0">提交审核
           </el-button>
@@ -2334,7 +2334,6 @@
         this.myitemsshow = true
       },
       checkFileList () {
-        console.log(this.$refs, 'this.$refs')
         this.$refs.checkFile.checkFileListShow = true
         this.$refs.checkFile.getValue(this.formData.SupplierId, this.formData.SupplierCertId, this.supplierData.OperType === '制造商' ? 1 : 2)
       },