后:工作流专业处室一键处理功能

src/dashoo.cn/backend/api/controllers/oilcontract/contractReview.go

@@ -602,22 +602,27 @@ func (this *OilContractReviewController) CommonAuditEntity() {
 		}
 	}()
 
-	//取出日常评审主表信息
-	conRev := contractReview.GetOilContractReviewService(utils.DBE)
-	var contractReviewEntity contractReview.OilContractReview
-	conRev.GetEntityById(Id, &contractReviewEntity)
-
-	svcActiviti := workflow.GetActivitiService(utils.DBE)
-	var ActiComplete workflow.ActiCompleteVM
-	ActiComplete.ProcessKey = workflow.OIL_DAILY_CONTRACT_EVALUATION
-	ActiComplete.BusinessKey = contractReviewEntity.BusinessKey
-	ActiComplete.UserId = this.User.Id //审批人员
-	ActiComplete.Result = result       //前台审批[同意、不同意]
-	ActiComplete.Remarks = AuditRemark
-	ActiComplete.CallbackUrl = utils.Cfg.MustValue("workflow", "callbackHost")
-	receiveVal := svcActiviti.TaskComplete(ActiComplete)
-	if receiveVal != "true" {
-		panic("工作流异常，请联系管理员！" + receiveVal)
+	if Id != "" {
+		Ids := strings.Split(Id, ",")
+		for i := 0; i < len(Ids); i++ {
+			//取出日常评审主表信息
+			conRev := contractReview.GetOilContractReviewService(utils.DBE)
+			var contractReviewEntity contractReview.OilContractReview
+			conRev.GetEntityById(Ids[i], &contractReviewEntity)
+
+			svcActiviti := workflow.GetActivitiService(utils.DBE)
+			var ActiComplete workflow.ActiCompleteVM
+			ActiComplete.ProcessKey = workflow.OIL_DAILY_CONTRACT_EVALUATION
+			ActiComplete.BusinessKey = contractReviewEntity.BusinessKey
+			ActiComplete.UserId = this.User.Id //审批人员
+			ActiComplete.Result = result       //前台审批[同意、不同意]
+			ActiComplete.Remarks = AuditRemark
+			ActiComplete.CallbackUrl = utils.Cfg.MustValue("workflow", "callbackHost")
+			receiveVal := svcActiviti.TaskComplete(ActiComplete)
+			if receiveVal != "true" {
+				panic("工作流异常，请联系管理员！" + receiveVal)
+			}
+		}
 	}
 }
 

src/dashoo.cn/backend/api/controllers/oilcontract/contractSumScore.go

@@ -900,22 +900,27 @@ func (this *OilContractSumScoreController) CommonAuditEntity() {
 		}
 	}()
 
-	//取出年度评审主表信息
-	conRev := contractSumScore.GetOilContractSumScoreService(utils.DBE)
-	var contractSumEntity contractSumScore.OilContractSumScore
-	conRev.GetEntityById(Id, &contractSumEntity)
-
-	svcActiviti := workflow.GetActivitiService(utils.DBE)
-	var ActiComplete workflow.ActiCompleteVM
-	ActiComplete.ProcessKey = workflow.OIL_ANNUAL_CONTRACT_EVALUATION
-	ActiComplete.BusinessKey = contractSumEntity.Businesskey
-	ActiComplete.UserId = this.User.Id //审批人员
-	ActiComplete.Result = result       //前台审批[同意、不同意]
-	ActiComplete.Remarks = AuditRemark
-	ActiComplete.CallbackUrl = utils.Cfg.MustValue("workflow", "callbackHost")
-	receiveVal := svcActiviti.TaskComplete(ActiComplete)
-	if receiveVal != "true" {
-		panic("工作流异常，请联系管理员！" + receiveVal)
+	if Id != "" {
+		Ids := strings.Split(Id, ",")
+		for i := 0; i < len(Ids); i++ {
+			//取出年度评审主表信息
+			conRev := contractSumScore.GetOilContractSumScoreService(utils.DBE)
+			var contractSumEntity contractSumScore.OilContractSumScore
+			conRev.GetEntityById(Ids[i], &contractSumEntity)
+
+			svcActiviti := workflow.GetActivitiService(utils.DBE)
+			var ActiComplete workflow.ActiCompleteVM
+			ActiComplete.ProcessKey = workflow.OIL_ANNUAL_CONTRACT_EVALUATION
+			ActiComplete.BusinessKey = contractSumEntity.Businesskey
+			ActiComplete.UserId = this.User.Id //审批人员
+			ActiComplete.Result = result       //前台审批[同意、不同意]
+			ActiComplete.Remarks = AuditRemark
+			ActiComplete.CallbackUrl = utils.Cfg.MustValue("workflow", "callbackHost")
+			receiveVal := svcActiviti.TaskComplete(ActiComplete)
+			if receiveVal != "true" {
+				panic("工作流异常，请联系管理员！" + receiveVal)
+			}
+		}
 	}
 }
 

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

@@ -732,6 +732,8 @@
             </viewer>
           </template>
         </el-table-column>
+        <el-table-column prop="FileUrlList" label="描述" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="150" align="center" fixed>
           <template slot-scope="scope">
             <el-button type="primary" plain size="mini" title="删除" style="margin-left:3px" :disabled="checkStatus.includes(formData.Status)"
@@ -1379,6 +1381,7 @@ export default {
         this.$axios.get('/supplier/getscenefilelist', {params}).then(res => {
           // TODO 文件已经仅只上传一张, 还需展示描述
           this.scenefile = res.data.item
+          console.log('345', this.scenefile)
           if (this.scenefile && this.scenefile.FileUrl && this.scenefile != null) {
             this.scenefileurllist = this.scenefile.FileUrl.split('$')
           }