bug修改

Signed-off-by: lijunqing <lijunqing@dashoo.cn>

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

@@ -789,13 +789,6 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 		receiveVal := svcActiviti.TaskComplete(ActiComplete)
 
 		if receiveVal == "true" {
-			supplierCertAppendEntity.Status = status
-			supplierCertAppendEntity.Step = step
-			cols := []string{
-				"Status",
-				"Step",
-			}
-			svc.UpdateEntityByIdCols(appendId, supplierCertAppendEntity, cols)
 			if supplierCertAppendEntity.Status == "5" {
 				if supplierCertAppendEntity.InStyle == "1" {
 					paysvc := paymentinfo.GetPaymentService(utils.DBE)
@@ -833,6 +826,13 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 					//paysvc.AddPaymentinfo(supplierCertAppendEntity.SupplierId, supplierCertAppendEntity.Id, Amount, "3")
 				}
 			}
+			supplierCertAppendEntity.Status = status
+			supplierCertAppendEntity.Step = step
+			cols := []string{
+				"Status",
+				"Step",
+			}
+			svc.UpdateEntityByIdCols(appendId, supplierCertAppendEntity, cols)
 			errinfo.Message = "提交成功！"
 			errinfo.Code = 0
 			this.Data["json"] = &errinfo

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

@@ -599,6 +599,7 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 			}
 		}
 		appendIdList = strings.Join(appendIdarr, ",")
+		appendIdList = strings.Trim(appendIdList, ",")
 		var listapp []suppliercertappend.OilSupplierCertAppendTodo
 		svcapp := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
 		if appendIdList != "" {

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

@@ -27,7 +27,7 @@
             v-if="auditBtn && this.formData.Status != '6'&& this.formData.Status != '10'">{{auditTitle}}</el-button>
             <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
             v-if="this.formData.Status == '10'">分办</el-button>
-          <router-link :to="'/oilsupplier/addtionaudit/techlist'">
+          <router-link :to="'/'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
         </span>
@@ -91,9 +91,6 @@
       </div>
     </el-card>
 
-    <el-dialog title="审批流程" :visible.sync="audithistoryshow" width="1200px">
-      <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
-    </el-dialog>
 
     <el-dialog title="审核" :visible.sync="dialogMakeSure">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
@@ -205,6 +202,10 @@
     </el-dialog>
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
       :visible="chooseAuditorVisible"></choose-auditor>
+ <el-dialog title="审批流程" :visible.sync="audithistoryshow" width="1200px">
+      <wf-multi-history ref="WfHistory" :entryinfo="entrydetail"></wf-multi-history>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -254,6 +255,7 @@
         }
       }
       return {
+        chooseAuditorVisible:false,
         audithistoryshow: false,
         auditerOptions: [], // 审核人员
         secauditerOptions: [],

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

@@ -27,7 +27,7 @@
             v-if="auditBtn && this.formData.Status != '6'">{{auditTitle}}</el-button>
             <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
             v-if="this.formData.Status == '10'">分办</el-button>
-          <router-link :to="'/oilsupplier/addtionaudit/techlist'">
+          <router-link :to="'/'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
         </span>
@@ -210,7 +210,9 @@
     </el-dialog>
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
       :visible="chooseAuditorVisible"></choose-auditor>
-
+ <el-dialog title="审批流程" :visible.sync="audithistoryshow" width="1200px">
+      <wf-multi-history ref="WfHistory" :entryinfo="entrydetail"></wf-multi-history>
+    </el-dialog>
   </div>
 </template>
 
@@ -311,11 +313,6 @@
           Remark: '', //备注
         },
         subfileList: [],
-        backhistroy: {
-          certId: '',
-          classId: '01',
-          workflowId: ''
-        },
         dialogVisible: false, //增项分办
         dialogTitle: '',
         dialogFormData: {

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

@@ -27,7 +27,7 @@
             v-if="auditBtn && this.formData.Status != '6'">{{auditTitle}}</el-button>
             <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
             v-if="this.formData.Status == '10'">分办</el-button>
-          <router-link :to="'/oilsupplier/supplierappend/techlist'">
+          <router-link :to="'/'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
         </span>
@@ -256,6 +256,7 @@
         }
       }
       return {
+        chooseAuditorVisible:false,
         subfileList: [],
         audithistoryshow: false,
         auditerOptions: [], // 审核人员

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

@@ -531,6 +531,7 @@
           Code: '', //分类编码
           Name: '', //分类名称
           Remark: '', //备注
+          Type:"2"
         },
         //列表数据
         entityList: [],

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

@@ -1148,7 +1148,8 @@
           SupplierCertId: parseInt(this.formData.SupplierCertId),
           SupplierCertAppendId: parseInt(this.dialogFormData.SupplierCertAppendId),
           SupplierTypeCode: '03',
-          Remark: this.dialogFormData.Remark
+          Remark: this.dialogFormData.Remark,
+          Type:"2"
         }
         if (_this.checkList.length > 0) {
           params = Object.assign(params, {