待办拉取年审，增项修改，年审页面修改

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

@@ -116,11 +116,24 @@ func (this *TodoListController) GetMyTaskEntityList() {
 		//找出待办任务 -- 增项
 		whereapp := "1=1"
 		whereapp = whereapp + " and b.Status>0"
-		appendIdList := actisvc.GetMyTasks(workflow.OIL_APPEND_APPLY, this.User.Id)
+		var appendIdList string
+		if actisvc.GetMyTasks(workflow.OIL_APPEND_APPLY, this.User.Id) != "" {
+			appendIdList = actisvc.GetMyTasks(workflow.OIL_APPEND_APPLY, this.User.Id)
+			appendIdList = appendIdList + ","
+		}
+		if actisvc.GetMyTasks(workflow.OIL_FIRST_APPEND_APPLY, this.User.Id) != "" {
+			appendIdList = fmt.Sprintf("%s %s", appendIdList, actisvc.GetMyTasks(workflow.OIL_FIRST_APPEND_APPLY, this.User.Id))
+			appendIdList = appendIdList + ","
+		}
+		if actisvc.GetMyTasks(workflow.OIL_SECOND_APPEND_APPLY, this.User.Id) != "" {
+			appendIdList = fmt.Sprintf("%s %s", appendIdList, actisvc.GetMyTasks(workflow.OIL_SECOND_APPEND_APPLY, this.User.Id))
+			appendIdList = appendIdList + ","
+		}
+		appendIdList = strings.Trim(appendIdList, ",")
 		appendIdarr := strings.Split(appendIdList, ",")
 		for i, item := range appendIdarr {
-			idx := strings.Index(item, "-")
-			if (idx >= 0) {
+			idx := strings.Index(item,"-")
+			if (idx >= 0 ) {
 				appendIdarr[i] = strings.Split(item, "-")[0]
 			}
 		}
@@ -160,7 +173,7 @@ func (this *TodoListController) GetMyTaskEntityList() {
 		if annuIdList != "" {
 			whereannu += " and Id in (" + annuIdList + ")"
 			//根据部门查询待办任务
-			whereannu += " and Status != 2 "
+			whereannu += " and Status > 0 "
 			svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &listannu, whereannu)
 
 			for _, item := range listannu {
@@ -228,7 +241,7 @@ func (this *TodoListController) GetMyTaskEntityList() {
 		}
 		if qualList != "" {
 			wherequal += " and Id in (" + qualList + ")"
-			wherequal += " and Status != -2 "
+			wherequal += " and Status > 0 "
 			svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &listqual, wherequal)
 			for _, item := range listqual {
 				todo.Id = item.Id

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

@@ -143,7 +143,7 @@
               <span>企业主要装备情况</span>
               <el-button style="float: right; padding: 3px 0" type="text" @click="equipmentdialog" v-if="Status <= 0">添加</el-button>
             </div>
-            <equipment-list ref="equipmentList" :data="equipmentList" :SupplierCertId="certId"
+            <equipment-list ref="equipmentList" :canadd="add_flat" :data="equipmentList" :SupplierCertId="certId"
               :SupplierTypeCode="classId" height="360px" style="margin-top: 20px"></equipment-list>
           </el-card>
 
@@ -152,7 +152,7 @@
               <span>近三年主要工程业绩</span>
               <el-button style="float: right; padding: 3px 0" type="text" @click="performancedialog" v-if="Status <= 0">添加</el-button>
             </div>
-            <performance-list ref="performanceList" :data="performanceList" :SupplierCertId="certId" :disabled="true"
+            <performance-list ref="performanceList" :canadd="add_flat" :data="performanceList" :SupplierCertId="certId" :disabled="true"
               :SupplierTypeCode="classId" height="360px" style="margin-top: 20px"></performance-list>
           </el-card>
 
@@ -161,7 +161,7 @@
               <span>专利及专有技术</span>
               <el-button style="float: right; padding: 3px 0" type="text" @click="patentdialog" v-if="Status <= 0">添加</el-button>
             </div>
-            <patent-list ref="patentList" :data="patentList" :SupplierCertId="certId" :SupplierTypeCode="classId"
+            <patent-list ref="patentList" :data="patentList" :canadd="add_flat" :SupplierCertId="certId" :SupplierTypeCode="classId"
               height="360px" style="margin-top: 20px">
             </patent-list>
           </el-card>
@@ -171,19 +171,19 @@
               <span>近三年省部级及以上获奖项目</span>
               <el-button style="float: right; padding: 3px 0" type="text" @click="winningdialog" v-if="Status <= 0">添加</el-button>
             </div>
-            <winning-list ref="winningList" :data="winningList" :SupplierCertId="certId" :SupplierTypeCode="classId"
+            <winning-list ref="winningList" :data="winningList" :canadd="add_flat" :SupplierCertId="certId" :SupplierTypeCode="classId"
               height="360px" style="margin-top: 20px">
             </winning-list>
           </el-card>
         </el-tab-pane>
 
         <el-tab-pane label="准入范围" :disabled="!certId">
-          <business-list ref="businessList" :data.sync="businessList" :canadd="add_flat" height="360px"
+          <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="add_flat" height="360px" style="margin-top: 20px"></subfile-list>
+          <subfile-list ref="subfileList" :data.sync="subfileList" :canadd="false" height="360px" style="margin-top: 20px"></subfile-list>
         </el-tab-pane>
 
         <el-tab-pane label="提交审批">
@@ -333,7 +333,7 @@
         addshow: false,
         canUpdateSupplier: true,
         dictData: null,
-        add_flat: false,
+        add_flat: true,
         applyLoading: false,
         equipmentList: [], //企业主要装备情况
         performanceList: [], //近三年主要工程业绩
@@ -473,6 +473,7 @@
       this.Status = this.$route.query.Status + ''
       this.Step = parseInt(this.$route.query.Step)
       this.annualId = this.$route.query.annualId
+      this.getstatus(this.annualId)
       this.WorkflowId = this.$route.query.WorkflowId + ''
       this.getDictOptions()
       this.formData.Id = this.serviceId
@@ -483,8 +484,22 @@
         this.savebtn = false
         this.canUpdateSupplier = true
       }
+      if (this.Status > 0) {
+        this.add_flat = false
+      }
     },
     methods: {
+      getstatus(annid) {
+        annualapi.getEntity(annid, this.$axios)
+          .then(res => {
+            this.formannData = res.data;
+            console.log("--forann-", this.formannData.Status)
+            this.Status = this.formannData.Status
+          })
+          .catch(err => {
+            console.error(err);
+          });
+      },
       inputCompany(val) {
         if (!this.certId) {
           api.getEntityByName(val, this.$axios).then(res => {

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

@@ -145,7 +145,7 @@
               <el-button style="float: right; padding: 3px 0" type="text" @click="equipmentdialog" v-if="Status <= 0">添加
               </el-button>
             </div>
-            <equipment-list ref="equipmentList" :data="equipmentList" :SupplierCertId="certId"
+            <equipment-list ref="equipmentList" :data="equipmentList" :canadd="add_flat" :SupplierCertId="certId"
               :SupplierTypeCode="classId" height="360px" style="margin-top: 20px"></equipment-list>
           </el-card>
 
@@ -155,7 +155,7 @@
               <el-button style="float: right; padding: 3px 0" type="text" @click="performancedialog" v-if="Status <= 0">
                 添加</el-button>
             </div>
-            <performance-list ref="performanceList" :data="performanceList" :SupplierCertId="certId" :disabled="true"
+            <performance-list ref="performanceList" :data="performanceList" :canadd="add_flat" :SupplierCertId="certId" :disabled="true"
               :SupplierTypeCode="classId" height="360px" style="margin-top: 20px"></performance-list>
           </el-card>
 
@@ -165,7 +165,7 @@
               <el-button style="float: right; padding: 3px 0" type="text" @click="patentdialog" v-if="Status <= 0">添加
               </el-button>
             </div>
-            <patent-list ref="patentList" :data="patentList" :SupplierCertId="certId" :SupplierTypeCode="classId"
+            <patent-list ref="patentList" :data="patentList" :canadd="add_flat" :SupplierCertId="certId" :SupplierTypeCode="classId"
               height="360px" style="margin-top: 20px">
             </patent-list>
           </el-card>
@@ -176,28 +176,18 @@
               <el-button style="float: right; padding: 3px 0" type="text" @click="winningdialog" v-if="Status <= 0">添加
               </el-button>
             </div>
-            <winning-list ref="winningList" :data="winningList" :SupplierCertId="certId" :SupplierTypeCode="classId"
+            <winning-list ref="winningList" :data="winningList" :canadd="add_flat" :SupplierCertId="certId" :SupplierTypeCode="classId"
               height="360px" style="margin-top: 20px">
             </winning-list>
           </el-card>
         </el-tab-pane>
-        <!-- <el-tab-pane label="准入范围" :disabled="!certId">
-          <business-list ref="businessList" :data.sync="businessList" :canadd="add_flat" height="360px"
-            style="margin-top: 20px"></business-list>
-        </el-tab-pane>
-
-        <el-tab-pane label="企业资质">
-          <auditbus-list ref="auditbusList" :data="auditbusList" :SupplierCertId="certId" :SupplierId="serviceId+''"
-            :SupplierTypeCode="classId" :Visiblebtn="'true'" height="360px" style="margin-top: 20px">
-          </auditbus-list>
-        </el-tab-pane> -->
        <el-tab-pane label="准入范围" :disabled="!certId">
-          <business-list ref="businessList" :data.sync="businessList" :canadd="add_flat" height="360px"
+          <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="add_flat" height="360px" style="margin-top: 20px"></subfile-list>
+          <subfile-list ref="subfileList" :data.sync="subfileList" :canadd="false" height="360px" style="margin-top: 20px"></subfile-list>
         </el-tab-pane>
 
         <el-tab-pane label="提交审批">
@@ -350,7 +340,7 @@
         addshow: false,
         canUpdateSupplier: true,
         dictData: null,
-        add_flat: false,
+        add_flat: true,
         applyLoading: false,
         equipmentList: [], //企业主要装备情况
         performanceList: [], //近三年主要工程业绩
@@ -490,6 +480,7 @@
       this.Status = this.$route.query.Status + ''
       this.Step = parseInt(this.$route.query.Step)
       this.annualId = this.$route.query.annualId
+      this.getstatus(this.annualId)
       this.WorkflowId = this.$route.query.WorkflowId + ''
       this.getDictOptions()
       this.formData.Id = this.serviceId
@@ -501,8 +492,22 @@
         this.savebtn = false
         this.canUpdateSupplier = true
       }
+      if (this.Status > 0) {
+        this.add_flat = false
+      }
     },
     methods: {
+      getstatus(annid) {
+        annualapi.getEntity(annid, this.$axios)
+          .then(res => {
+            this.formannData = res.data;
+            console.log("--forann-", this.formannData.Status)
+            this.Status = this.formannData.Status
+          })
+          .catch(err => {
+            console.error(err);
+          });
+      },
       inputCompany(val) {
         if (!this.certId) {
           api.getEntityByName(val, this.$axios).then(res => {