增项页面

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

@@ -292,6 +292,93 @@ func (this *OilSupplierCertAppendController) DeleteEntity() {
 	}
 }
 
+// @Title 获取列表
+// @Description get user by token
+// @Success 200 {object} []supplier.OilSupplierView
+// @router /mytasks [get]
+func (this *OilSupplierCertAppendController) GetMyTaskEntityList() {
+
+	//获取分页信息
+	page := this.GetPageInfoForm()
+	where := " 1=1 "
+	orderby := "Id"
+	asc := false
+	Order := this.GetString("Order")
+	where = where + " and Status>0"
+	Prop := this.GetString("Prop")
+	if Order != "" && Prop != "" {
+		orderby = Prop
+		if Order == "asc" {
+			asc = true
+		}
+	}
+	ApplyDate := this.GetString("ApplyDate")
+	RecUnitId := this.GetString("RecUnitId")
+	RecUnitName := this.GetString("RecUnitName")
+	AppendType := this.GetString("AppendType")
+	DenyReason := this.GetString("DenyReason")
+	AuditDate := this.GetString("AuditDate")
+	Remark := this.GetString("Remark")
+	CreateOn := this.GetString("CreateOn")
+
+	if ApplyDate != "" {
+		where = where + " and ApplyDate like '%" + ApplyDate + "%'"
+	}
+
+	if RecUnitId != "" {
+		where = where + " and RecUnitId like '%" + RecUnitId + "%'"
+	}
+
+	if RecUnitName != "" {
+		where = where + " and RecUnitName like '%" + RecUnitName + "%'"
+	}
+
+	if AppendType != "" {
+		where = where + " and AppendType like '" + AppendType + "'"
+	}
+
+	if DenyReason != "" {
+		where = where + " and DenyReason like '%" + DenyReason + "%'"
+	}
+
+	if AuditDate != "" {
+		where = where + " and AuditDate like '%" + AuditDate + "%'"
+	}
+
+	if Remark != "" {
+		where = where + " and Remark like '%" + Remark + "%'"
+	}
+
+	if CreateOn != "" {
+		dates := strings.Split(CreateOn, ",")
+		if len(dates) == 2 {
+			minDate := dates[0]
+			maxDate := dates[1]
+			where = where + " and CreateOn>='" + minDate + "' and CreateOn<='" + maxDate + "'"
+		}
+	}
+
+	//找出待办任务
+	actisvc := workflow.GetActivitiService(utils.DBE)
+	appendIdList := actisvc.GetMyTasks(workflow.OIL_APPEND_APPLY, this.User.Id)
+	where += " and Id in (" + appendIdList + ")"
+	//根据部门查询待办任务
+
+	svc := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
+	var list []suppliercertappend.OilSupplierCertAppend
+
+	total := svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, where)
+
+	var datainfo DataInfo
+	datainfo.Items = list
+	datainfo.CurrentItemCount = total
+	datainfo.PageIndex = page.CurrentPage
+	datainfo.ItemsPerPage = page.Size
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
+
+
 // @Title 提交审批
 // @Description 提交审批
 // @Success	200	{object} controllers.Request

src/dashoo.cn/frontend_web/src/api/oilsupplier/supplierappend.js

@@ -32,6 +32,13 @@ export default {
       method: 'delete'
     })
   },
+  getMyTasks (CreateOn, params, myAxios) {
+    return myAxios({
+      url: '/suppliercertappend/mytasks?CreateOn=' + CreateOn,
+      method: 'GET',
+      params: params
+    })
+  },
   //提交审批
   auditEntity (entityId, FirstAudit, myAxios) {
     return myAxios({

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

@@ -2,7 +2,7 @@
   <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/oilsupplier/supplierappend/basislist' }">基建类列表</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilsupplier/addtionaudit/techlist' }">基建类列表</el-breadcrumb-item>
       <el-breadcrumb-item>编辑</el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card">
@@ -11,7 +11,7 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
-          <router-link :to="'/oilsupplier/supplierappend/basislist'">
+          <router-link :to="'/oilsupplier/addtionaudit/techlist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
         </span>
@@ -26,18 +26,17 @@
             <el-row>
               <el-col :span="12">
                 <el-form-item label="推荐单位名称" prop="checkSelectedRecUnitName">
-                  <el-cascader ref="tjdwCascader" :options="organizeTreeList" :props="organizeTreeProps" change-on-select :show-all-levels="false" 
-                                v-model="selectedOrgList" @change="getCode2" placeholder="请选择推荐单位" style="width: 100%">
+                  <el-cascader ref="tjdwCascader" :options="organizeTreeList" :props="organizeTreeProps"
+                    change-on-select :show-all-levels="false" v-model="selectedOrgList" @change="getCode2"
+                    placeholder="请选择推荐单位" style="width: 100%">
                   </el-cascader>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="供应方公司名称" prop="checkSelectedSupplier">
-                  <el-select v-model="supplierOptions" filterable @change="getInfo" placeholder="请选择供应方公司" style="width: 100%">
-                    <el-option
-                      v-for="item in supplierList"
-                      :key="item.SupplierId"
-                      :label="item.SupplierName"
+                  <el-select v-model="supplierOptions" filterable @change="getInfo" placeholder="请选择供应方公司"
+                    style="width: 100%">
+                    <el-option v-for="item in supplierList" :key="item.SupplierId" :label="item.SupplierName"
                       :value="item.SupplierId">
                     </el-option>
                   </el-select>
@@ -65,8 +64,10 @@
           <el-table :data="entityList" border height="calc(100vh - 345px)" style="width: 100%" @sort-change="orderby">
             <el-table-column label="操作" min-width="100" align="center" fixed>
               <template slot-scope="scope">
-                <el-button type="text" title="编辑" size="medium" icon="el-icon-edit" @click="editSortData(scope.row)"></el-button>
-                <el-button type="text" title="删除" size="medium" icon="el-icon-delete" @click="deleteData(scope.row.Id)"></el-button>
+                <el-button type="text" title="编辑" size="medium" icon="el-icon-edit" @click="editSortData(scope.row)">
+                </el-button>
+                <el-button type="text" title="删除" size="medium" icon="el-icon-delete" @click="deleteData(scope.row.Id)">
+                </el-button>
               </template>
             </el-table-column>
             <el-table-column prop="SortFlag" label="分类标记" v-if="1==2" show-overflow-tooltip></el-table-column>
@@ -74,20 +75,22 @@
             <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
             <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
           </el-table>
-          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                        :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+            :current-page="currentPage" :page-sizes="[10, 15, 20, 25]" :page-size="size"
+            layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
           </el-pagination>
         </el-card>
       </div>
     </el-card>
     <!-- 增项分类添加、修改 -->
     <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="800px">
-      <el-form label-width="150px" ref="dialogFormData" :rules="sortEntityFormRules" :model="dialogFormData" >
+      <el-form label-width="150px" ref="dialogFormData" :rules="sortEntityFormRules" :model="dialogFormData">
         <el-row>
           <el-col :span="12">
             <el-form-item label="分类名称" prop="checkSelectedOptList">
-              <el-cascader ref="cascader" :options="optionsList" style="width:100%" :props="orgtreeprops" change-on-select :show-all-levels="false" 
-                v-model="selectedOptList" @change="getCode" placeholder="请选择分类">
+              <el-cascader ref="cascader" :options="optionsList" style="width:100%" :props="orgtreeprops"
+                change-on-select :show-all-levels="false" v-model="selectedOptList" @change="getCode"
+                placeholder="请选择分类">
               </el-cascader>
             </el-form-item>
           </el-col>
@@ -97,8 +100,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="备注"  prop="Remark">
-              <el-input type="textarea" v-model="dialogFormData.Remark" placeholder="请输入备注"  style="width: 100%"></el-input>
+            <el-form-item label="备注" prop="Remark">
+              <el-input type="textarea" v-model="dialogFormData.Remark" placeholder="请输入备注" style="width: 100%">
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -179,24 +183,24 @@
           Id: '',
           SupplierId: 1,
           SupplierCertId: 1,
-          RecUnitFlag: '',//推荐单位的级联Id标记
+          RecUnitFlag: '', //推荐单位的级联Id标记
           RecUnitId: '', //推荐单位编码
           RecUnitName: '', //推荐单位名称
           AppendType: '', //增项类别(1 物资类，2 基建类，3 技术服务类)
-          Remark: '',//备注
+          Remark: '', //备注
         },
-        dialogVisible: false,//增项分类dialog
+        dialogVisible: false, //增项分类dialog
         dialogTitle: '',
         dialogFormData: {
           Id: '',
-          SupplierId: 1,//供方表ID
-          SupplierCertId: 1,//供方证书表ID
-          SupplierCertAppendId: '',//增项信息表ID
-          SubClassId: 2,//分类表主键（物资类或基建类或技术服务类）
-          SortFlag: '',//分类标记
-          Code: '',//分类编码
-          Name: '',//分类名称
-          Remark: '',//备注
+          SupplierId: 1, //供方表ID
+          SupplierCertId: 1, //供方证书表ID
+          SupplierCertAppendId: '', //增项信息表ID
+          SubClassId: 2, //分类表主键（物资类或基建类或技术服务类）
+          SortFlag: '', //分类标记
+          Code: '', //分类编码
+          Name: '', //分类名称
+          Remark: '', //备注
         },
         //列表数据
         entityList: [],
@@ -230,19 +234,20 @@
             trigger: 'blur'
           }],
         },
-        Id: '', //传的参数
+        AnnualId: '', //传的参数
+        serviceId: '',
         editFlag: '', //编辑操作标记
       }
     },
     created() {
       // this.serviceType = this.$route.params.opera //获取服务类型
-      this.Id = this.$route.query.Id
+      this.serviceId = this.$route.params.opera
+      console.log("---this.serviceId----", this.serviceId)
       this.editFlag = this.$route.query.editFlag
-      if(this.editFlag == '1' && this.Id !== '') {
-        this.getEntityById()
-        this.dialogFormData.SupplierCertAppendId = this.Id
-        this.getSortList()
-      }
+      this.AnnualId = this.serviceId
+      this.getEntityById()
+      this.dialogFormData.SupplierCertAppendId = this.AnnualId
+      this.getSortList()
       this.getOrgTreeList() //获取推荐单位层级列表
       this.getTechTreeList() //获取技术服务类层级列表
       this.getSupplierList() //获取供应方公司列表
@@ -291,10 +296,10 @@
       },
 
       //获取SupplierId和SupplierCertId
-      getInfo(vId) {//这个vId也就是value值
+      getInfo(vId) { //这个vId也就是value值
         let obj = {}
-        obj = this.supplierList.find((item)=>{
-          return item.SupplierId === vId;//筛选出匹配数据
+        obj = this.supplierList.find((item) => {
+          return item.SupplierId === vId; //筛选出匹配数据
         })
         this.formData.SupplierId = parseInt(obj.SupplierId)
         this.formData.SupplierCertId = parseInt(obj.SupplierCertId)
@@ -304,7 +309,7 @@
       getCode(item) {
         let sortFlagStr = item.toString()
         this.dialogFormData.SortFlag = sortFlagStr
-        this.getCodeById(item[item.length-1]) //根据分类Id获取Code
+        this.getCodeById(item[item.length - 1]) //根据分类Id获取Code
       },
 
       //根据分类Id获取Code
@@ -328,14 +333,15 @@
       //获取需要修改的增项信息
       getEntityById() {
         let _this = this
-        api2.getEntityById(_this.Id, _this.$axios).then(res => {
+        api2.getEntityById(_this.AnnualId, _this.$axios).then(res => {
           _this.formData = res.data
+          console.log("--_this.formData---",_this.formData)
           //显示原推荐单位
           if (_this.formData.RecUnitFlag != null) {
             let arr = _this.formData.RecUnitFlag.split(',')
             let arr2 = []
             for (let i = 0; i < arr.length; i++) {
-               arr2.push(parseInt(arr[i]))
+              arr2.push(parseInt(arr[i]))
             }
             _this.selectedOrgList = arr2
           }
@@ -352,8 +358,8 @@
         this.$refs['EntityForm'].validate((valid) => {
           if (valid) {
             let arr = _this.$refs['tjdwCascader'].currentLabels
-            _this.formData.RecUnitName = arr[arr.length - 1]  //获取推荐单位名
-            if(_this.editFlag == '1' && _this.Id !== '') {
+            _this.formData.RecUnitName = arr[arr.length - 1] //获取推荐单位名
+            if (_this.editFlag == '1' && _this.AnnualId !== '') {
               _this.updateData()
             } else {
               _this.addAppend()
@@ -367,7 +373,7 @@
       //更新增项信息
       updateData() {
         let _this = this
-        api2.updateEntity(_this.Id, _this.formData, _this.$axios).then(res => {
+        api2.updateEntity(_this.AnnualId, _this.formData, _this.$axios).then(res => {
           if (res.data.code === 0) {
             this.$message({
               type: 'success',
@@ -422,16 +428,16 @@
               })
             }
           })
-        .catch(err => {
-          console.error(err)
-        })
+          .catch(err => {
+            console.error(err)
+          })
       },
 
       //添加增项分类
       addSortData() {
         let _this = this
         //先判断是否保存了增项信息
-        if(this.checkAppendSave()) {
+        if (this.checkAppendSave()) {
           _this.dialogTitle = '添加'
           _this.dialogVisible = true
           _this.selectedOptList = [] //置空，防止先修改再添加时的已选分类信息保留
@@ -453,7 +459,7 @@
           let arr = _this.dialogFormData.SortFlag.split(',')
           let arr2 = []
           for (let i = 0; i < arr.length; i++) {
-              arr2.push(parseInt(arr[i]))
+            arr2.push(parseInt(arr[i]))
           }
           _this.selectedOptList = arr2
         }
@@ -518,7 +524,7 @@
         }
         return true
       },
-      
+
       //添加增项分类信息
       addSortAppend() {
         let _this = this
@@ -549,30 +555,30 @@
       deleteData(Id) {
         let _this = this
         _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          api.deleteEntity(Id, _this.$axios)
-            .then(res => {
-              // response
-              if (res.data.code === 0) {
-                _this.$message({
-                  type: 'success',
-                  message: res.data.message
-                })
-                // 更新列表
-                this.getSortList()
-              } else {
-                _this.$message({
-                  type: 'warning',
-                  message: res.data.message
-                })
-              }
-            })
-            .catch(() => {})
-        })
-        .catch(() => {})
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            api.deleteEntity(Id, _this.$axios)
+              .then(res => {
+                // response
+                if (res.data.code === 0) {
+                  _this.$message({
+                    type: 'success',
+                    message: res.data.message
+                  })
+                  // 更新列表
+                  this.getSortList()
+                } else {
+                  _this.$message({
+                    type: 'warning',
+                    message: res.data.message
+                  })
+                }
+              })
+              .catch(() => {})
+          })
+          .catch(() => {})
       },
 
       //列表排序功能

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

@@ -2,7 +2,7 @@
   <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/oilsupplier/supplierappend/goodslist' }">物资类列表</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilsupplier/addtionaudit/techlist' }">物资类列表</el-breadcrumb-item>
       <el-breadcrumb-item>编辑</el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card">
@@ -11,7 +11,7 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
-          <router-link :to="'/oilsupplier/supplierappend/goodslist'">
+          <router-link :to="'/oilsupplier/addtionaudit/techlist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
         </span>
@@ -20,7 +20,6 @@
         <el-card class="box-card">
           <div slot="header">
             <span><i class="icon icon-table2"></i> 增项信息</span>
-            <el-button style="float: right; padding: 3px 0" type="text" @click="saveEntity()">保存信息</el-button>
           </div>
           <el-form label-width="150px" ref="EntityForm" :rules="appendRules" :model="formData">
             <el-row>
@@ -33,11 +32,9 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="供应方公司名称" prop="checkSelectedSupplier">
-                  <el-select v-model="supplierOptions" filterable @change="getInfo" placeholder="请选择供应方公司" style="width: 100%">
-                    <el-option
-                      v-for="item in supplierList"
-                      :key="item.SupplierId"
-                      :label="item.SupplierName"
+                  <el-select v-model="supplierOptions" filterable @change="getInfo" placeholder="请选择供应方公司"
+                    style="width: 100%">
+                    <el-option v-for="item in supplierList" :key="item.SupplierId" :label="item.SupplierName"
                       :value="item.SupplierId">
                     </el-option>
                   </el-select>
@@ -60,34 +57,29 @@
         <el-card class="box-card" style="margin-top: 10px;">
           <div slot="header">
             <span><i class="icon icon-table2"></i> 增项分类</span>
-            <el-button style="float: right; padding: 3px 0" type="text" @click="addSortData()">添加</el-button>
           </div>
           <el-table :data="entityList" border height="calc(100vh - 345px)" style="width: 100%" @sort-change="orderby">
-            <el-table-column label="操作" min-width="100" align="center" fixed>
-              <template slot-scope="scope">
-                <el-button type="text" title="编辑" size="medium" icon="el-icon-edit" @click="editSortData(scope.row)"></el-button>
-                <el-button type="text" title="删除" size="medium" icon="el-icon-delete" @click="deleteData(scope.row.Id)"></el-button>
-              </template>
-            </el-table-column>
             <el-table-column prop="SortFlag" label="分类标记" v-if="1==2" show-overflow-tooltip></el-table-column>
             <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>
             <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
             <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
           </el-table>
-          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                        :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+            :current-page="currentPage" :page-sizes="[10, 15, 20, 25]" :page-size="size"
+            layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
           </el-pagination>
         </el-card>
       </div>
     </el-card>
     <!-- 增项分类添加、修改 -->
     <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="800px">
-      <el-form label-width="150px" ref="dialogFormData" :rules="sortEntityFormRules" :model="dialogFormData" >
+      <el-form label-width="150px" ref="dialogFormData" :rules="sortEntityFormRules" :model="dialogFormData">
         <el-row>
           <el-col :span="12">
             <el-form-item label="分类名称" prop="checkSelectedOptList">
-              <el-cascader ref="cascader" :options="optionsList" style="width:100%" :props="orgtreeprops" change-on-select :show-all-levels="false" 
-                v-model="selectedOptList" @change="getCode" placeholder="请选择分类">
+              <el-cascader ref="cascader" :options="optionsList" style="width:100%" :props="orgtreeprops"
+                change-on-select :show-all-levels="false" v-model="selectedOptList" @change="getCode"
+                placeholder="请选择分类">
               </el-cascader>
             </el-form-item>
           </el-col>
@@ -97,8 +89,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="备注"  prop="Remark">
-              <el-input type="textarea" v-model="dialogFormData.Remark" placeholder="请输入备注"  style="width: 100%"></el-input>
+            <el-form-item label="备注" prop="Remark">
+              <el-input type="textarea" v-model="dialogFormData.Remark" placeholder="请输入备注" style="width: 100%">
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -179,24 +172,24 @@
           Id: '',
           SupplierId: 1,
           SupplierCertId: 1,
-          RecUnitFlag: '',//推荐单位的级联Id标记
+          RecUnitFlag: '', //推荐单位的级联Id标记
           RecUnitId: '', //推荐单位编码
           RecUnitName: '', //推荐单位名称
           AppendType: '', //增项类别(1 物资类，2 基建类，3 技术服务类)
-          Remark: '',//备注
+          Remark: '', //备注
         },
-        dialogVisible: false,//增项分类dialog
+        dialogVisible: false, //增项分类dialog
         dialogTitle: '',
         dialogFormData: {
           Id: '',
-          SupplierId: 1,//供方表ID
-          SupplierCertId: 1,//供方证书表ID
-          SupplierCertAppendId: '',//增项信息表ID
-          SubClassId: 2,//分类表主键（物资类或基建类或技术服务类）
-          SortFlag: '',//分类标记
-          Code: '',//分类编码
-          Name: '',//分类名称
-          Remark: '',//备注
+          SupplierId: 1, //供方表ID
+          SupplierCertId: 1, //供方证书表ID
+          SupplierCertAppendId: '', //增项信息表ID
+          SubClassId: 2, //分类表主键（物资类或基建类或技术服务类）
+          SortFlag: '', //分类标记
+          Code: '', //分类编码
+          Name: '', //分类名称
+          Remark: '', //备注
         },
         //列表数据
         entityList: [],
@@ -230,19 +223,19 @@
             trigger: 'blur'
           }],
         },
-        Id: '', //传的参数
+        AnnualId: '', //传的参数
+        serviceId: '',
         editFlag: '', //编辑操作标记
       }
     },
     created() {
       // this.serviceType = this.$route.params.opera //获取服务类型
-      this.Id = this.$route.query.Id
-      this.editFlag = this.$route.query.editFlag
-      if(this.editFlag == '1' && this.Id !== '') {
-        this.getEntityById()
-        this.dialogFormData.SupplierCertAppendId = this.Id
-        this.getSortList()
-      }
+      this.serviceId = this.$route.params.opera
+      this.AnnualId = this.serviceId
+      this.editFlag = '1'
+      this.getEntityById()
+      this.dialogFormData.SupplierCertAppendId = this.AnnualId
+      this.getSortList()
       this.getOrgTreeList() //获取推荐单位层级列表
       this.getTechTreeList() //获取技术服务类层级列表
       this.getSupplierList() //获取供应方公司列表
@@ -291,10 +284,10 @@
       },
 
       //获取SupplierId和SupplierCertId
-      getInfo(vId) {//这个vId也就是value值
+      getInfo(vId) { //这个vId也就是value值
         let obj = {}
-        obj = this.supplierList.find((item)=>{
-          return item.SupplierId === vId;//筛选出匹配数据
+        obj = this.supplierList.find((item) => {
+          return item.SupplierId === vId; //筛选出匹配数据
         })
         this.formData.SupplierId = parseInt(obj.SupplierId)
         this.formData.SupplierCertId = parseInt(obj.SupplierCertId)
@@ -304,7 +297,7 @@
       getCode(item) {
         let sortFlagStr = item.toString()
         this.dialogFormData.SortFlag = sortFlagStr
-        this.getCodeById(item[item.length-1]) //根据分类Id获取Code
+        this.getCodeById(item[item.length - 1]) //根据分类Id获取Code
       },
 
       //根据分类Id获取Code
@@ -328,8 +321,9 @@
       //获取需要修改的增项信息
       getEntityById() {
         let _this = this
-        api2.getEntityById(_this.Id, _this.$axios).then(res => {
+        api2.getEntityById(_this.AnnualId, _this.$axios).then(res => {
           _this.formData = res.data
+          console.log("---_this.formData--",_this.formData)
           //显示原推荐单位
           if (_this.formData.RecUnitFlag != null) {
             let arr = _this.formData.RecUnitFlag.split(',')
@@ -352,8 +346,8 @@
         this.$refs['EntityForm'].validate((valid) => {
           if (valid) {
             let arr = _this.$refs['tjdwCascader'].currentLabels
-            _this.formData.RecUnitName = arr[arr.length - 1]  //获取推荐单位名
-            if(_this.editFlag == '1' && _this.Id !== '') {
+            _this.formData.RecUnitName = arr[arr.length - 1] //获取推荐单位名
+            if (_this.editFlag == '1' && _this.AnnualId !== '') {
               _this.updateData()
             } else {
               _this.addAppend()
@@ -367,7 +361,7 @@
       //更新增项信息
       updateData() {
         let _this = this
-        api2.updateEntity(_this.Id, _this.formData, _this.$axios).then(res => {
+        api2.updateEntity(_this.AnnualId, _this.formData, _this.$axios).then(res => {
           if (res.data.code === 0) {
             this.$message({
               type: 'success',
@@ -422,16 +416,16 @@
               })
             }
           })
-        .catch(err => {
-          console.error(err)
-        })
+          .catch(err => {
+            console.error(err)
+          })
       },
 
       //添加增项分类
       addSortData() {
         let _this = this
         //先判断是否保存了增项信息
-        if(this.checkAppendSave()) {
+        if (this.checkAppendSave()) {
           _this.dialogTitle = '添加'
           _this.dialogVisible = true
           _this.selectedOptList = [] //置空，防止先修改再添加时的已选分类信息保留
@@ -453,7 +447,7 @@
           let arr = _this.dialogFormData.SortFlag.split(',')
           let arr2 = []
           for (let i = 0; i < arr.length; i++) {
-              arr2.push(parseInt(arr[i]))
+            arr2.push(parseInt(arr[i]))
           }
           _this.selectedOptList = arr2
         }
@@ -518,7 +512,7 @@
         }
         return true
       },
-      
+
       //添加增项分类信息
       addSortAppend() {
         let _this = this
@@ -549,30 +543,30 @@
       deleteData(Id) {
         let _this = this
         _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          api.deleteEntity(Id, _this.$axios)
-            .then(res => {
-              // response
-              if (res.data.code === 0) {
-                _this.$message({
-                  type: 'success',
-                  message: res.data.message
-                })
-                // 更新列表
-                this.getSortList()
-              } else {
-                _this.$message({
-                  type: 'warning',
-                  message: res.data.message
-                })
-              }
-            })
-            .catch(() => {})
-        })
-        .catch(() => {})
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            api.deleteEntity(Id, _this.$axios)
+              .then(res => {
+                // response
+                if (res.data.code === 0) {
+                  _this.$message({
+                    type: 'success',
+                    message: res.data.message
+                  })
+                  // 更新列表
+                  this.getSortList()
+                } else {
+                  _this.$message({
+                    type: 'warning',
+                    message: res.data.message
+                  })
+                }
+              })
+              .catch(() => {})
+          })
+          .catch(() => {})
       },
 
       //列表排序功能

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/goodslist.vue

@@ -213,7 +213,7 @@
         //查询条件
         Object.assign(params, this.searchForm)
         //访问接口
-        api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
+        api.getMyTasks(myCreateOn.join(','), params, this.$axios).then(res => {
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount
         }).catch(err => {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/techlist.vue

@@ -9,11 +9,6 @@
         <span>
           <i class="icon icon-table2"></i> 增项初审
         </span>
-        <span style="float: right;">
-          <router-link :to="'/oilsupplier/supplierappend/3/techdataopera'">
-            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">添加</el-button>
-          </router-link>
-        </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="上报时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
@@ -33,10 +28,9 @@
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" min-width="100" align="center" fixed>
           <template slot-scope="scope">
-            <el-button type="text" title="编辑" size="medium" icon="el-icon-edit" @click="editData(scope.row)">
-            </el-button>
-            <el-button type="text" title="删除" size="medium" icon="el-icon-delete" @click="deleteData(scope.row.Id)">
-            </el-button>
+            <router-link :to="'/oilsupplier/addtionaudit/' + scope.row.Id + '/' + (scope.row.AppendType === '1' ? 'goodsdataopera' : (scope.row.AppendType === '2' ? 'basisdataopera' : 'techdataopera'))">
+              <el-button type="primary" plain size="mini" title="审核">审核</el-button>
+            </router-link>
           </template>
         </el-table-column>
         <el-table-column prop="ApplyDate" label="申请日期" sortable min-width="130" align="center" show-overflow-tooltip>
@@ -52,14 +46,44 @@
             {{ checkAppendType(scope.row.AppendType) }}
           </template>
         </el-table-column>
-        <el-table-column prop="DenyReason" label="退回原因" sortable min-width="130" align="center" show-overflow-tooltip>
-        </el-table-column>
-        <el-table-column prop="AuditDate" label="审核日期" sortable min-width="130" align="center" show-overflow-tooltip>
+        <!-- <el-table-column prop="AuditDate" label="审核日期" sortable min-width="130" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ jstimehandle(scope.row.AuditDate) }}
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column prop="Status" label="状态标识" sortable min-width="130" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-alert v-if="scope.row.Status=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="待二级复审" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='4'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="待专业科室审核" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='0'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="初始" type="info">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="待二级初审" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="待集中评审" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="专业科室接收" type="success">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="专业审核未通过" type="error">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='6'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="待交费" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='7'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="待入库" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='8'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="完成" type="success">
+            </el-alert>
+          </template>
         </el-table-column>
         <el-table-column prop="Remark" label="备注" sortable min-width="130" align="center" show-overflow-tooltip>
         </el-table-column>
@@ -173,7 +197,7 @@
           ApplyDate: '',
           RecUnitId: '',
           RecUnitName: '',
-          AppendType: '3', //增项类别(1 物资类，2 基建类，3 技术服务类)
+          AppendType: '', //增项类别(1 物资类，2 基建类，3 技术服务类)
           DenyReason: '',
           AuditDate: '',
           Status: '',
@@ -225,7 +249,7 @@
         //查询条件
         Object.assign(params, this.searchForm)
         //访问接口
-        api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
+        api.getMyTasks(myCreateOn.join(','), params, this.$axios).then(res => {
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount
         }).catch(err => {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/annualfistaudit.vue

@@ -59,10 +59,10 @@
         <el-table-column sortable min-width="110" align="center" prop="Status" label="审核状态">
           <template slot-scope="scope">
             <el-alert v-if="scope.row.Status=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="初审未通过" type="warning">
+              title="初审未通过" type="error">
             </el-alert>
             <el-alert v-if="scope.row.Status=='4'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="审核未通过" type="error">
+              title="专业审核通过" type="success">
             </el-alert>
             <el-alert v-if="scope.row.Status=='0'" :closable="false" style="background:rgba(255,255,255,0.2)"
               title="已申请" type="info">
@@ -71,10 +71,10 @@
               title="初审通过" type="success">
             </el-alert>
             <el-alert v-if="scope.row.Status=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="已交费" type="success">
+              title="专业审核未通过" type="error">
             </el-alert>
             <el-alert v-if="scope.row.Status=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="专业审核通过" type="success">
+              title="业务处已接收" type="warning">
             </el-alert>
           </template>
         </el-table-column>

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

@@ -11,7 +11,7 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
-           <el-button type="primary" size="mini" style="margin-right: 3px" @click="AuditdialogShow = true" v-if="formData.Id !=''">提交审批
+           <el-button type="primary" size="mini" style="margin-right: 3px" @click="AuditdialogShow = true" v-if="formData.Id !='' && formData.Status == ''">提交审批
           </el-button>
           <router-link :to="'/oilsupplier/supplierappend/goodslist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
@@ -679,7 +679,7 @@
         api2.auditEntity(this.formData.Id, this.FirstAudit, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改
-            this.initDatas()
+            this.getEntityById()
             this.AuditdialogShow = false
             this.$message({
               type: 'success',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/basislist.vue

@@ -55,7 +55,40 @@
             {{ jstimehandle(scope.row.AuditDate) }}
           </template>
         </el-table-column>
-        <el-table-column prop="Status" label="状态标识" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="Status" label="状态标识" sortable min-width="130" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-alert v-if="scope.row.Status=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="待二级复审" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='4'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="待专业科室审核" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='0'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="初始" type="info">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="待二级初审" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="待集中评审" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="专业科室接收" type="success">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="专业审核未通过" type="error">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='6'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="待交费" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='7'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="待入库" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='8'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="完成" type="success">
+            </el-alert>
+          </template>
+        </el-table-column>
         <el-table-column prop="Remark" label="备注" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column>
 
       </el-table>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/goodslist.vue

@@ -55,7 +55,40 @@
             {{ jstimehandle(scope.row.AuditDate) }}
           </template>
         </el-table-column>
-        <el-table-column prop="Status" label="状态标识" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="Status" label="状态标识" sortable min-width="130" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-alert v-if="scope.row.Status=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="待二级复审" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='4'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="待专业科室审核" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='0'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="初始" type="info">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="待二级初审" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="待集中评审" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="专业科室接收" type="success">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="专业审核未通过" type="error">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='6'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="待交费" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='7'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="待入库" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='8'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="完成" type="success">
+            </el-alert>
+          </template>
+        </el-table-column>
         <el-table-column prop="Remark" label="备注" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column>
 
       </el-table>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/techlist.vue

@@ -55,7 +55,40 @@
             {{ jstimehandle(scope.row.AuditDate) }}
           </template>
         </el-table-column>
-        <el-table-column prop="Status" label="状态标识" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="Status" label="状态标识" sortable min-width="130" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-alert v-if="scope.row.Status=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="待二级复审" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='4'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="待专业科室审核" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='0'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="初始" type="info">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="待二级初审" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="待集中评审" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="专业科室接收" type="success">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="专业审核未通过" type="error">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='6'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="待交费" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='7'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="待入库" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='8'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="完成" type="success">
+            </el-alert>
+          </template>
+        </el-table-column>
         <el-table-column prop="Remark" label="备注" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column>
 
       </el-table>