合并远程

package.json

@@ -15,11 +15,6 @@
       "path": "node_modules/cz-git"
     }
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
   "lint-staged": {
     "src/**/*.{js,vue}": [
       "eslint --fix",
@@ -42,7 +37,8 @@
   "dependencies": {
     "@babel/parser": "7.7.4",
     "@riophae/vue-treeselect": "0.4.0",
-    "axios": "0.24.0",
+    "axios": "^1.10.0",
+    "bpmn-js-token-simulation": "0.10.0",
     "clipboard": "2.0.8",
     "core-js": "3.25.3",
     "echarts": "5.4.0",
@@ -64,15 +60,14 @@
     "vue-router": "3.4.9",
     "vuedraggable": "2.24.3",
     "vuex": "3.6.0",
-    "xml-js": "1.6.11",
-    "bpmn-js-token-simulation": "0.10.0"
+    "xml-js": "1.6.11"
   },
   "devDependencies": {
     "@commitlint/cli": "^19.7.1",
     "@commitlint/config-conventional": "^19.7.1",
-    "@vue/cli-plugin-babel": "4.4.6",
-    "@vue/cli-plugin-eslint": "4.4.6",
-    "@vue/cli-service": "4.4.6",
+    "@vue/cli-plugin-babel": "^5.0.8",
+    "@vue/cli-plugin-eslint": "^5.0.8",
+    "@vue/cli-service": "^5.0.8",
     "babel-eslint": "10.1.0",
     "babel-plugin-dynamic-import-node": "2.3.3",
     "bpmn-js": "7.5.0",

src/api/system/project.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询模板信息列表
+export function listProject(query) {
+  return request({
+    url: '/system/project/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询模板信息详细
+export function getProject(id) {
+  return request({
+    url: '/system/project/' + id,
+    method: 'get'
+  })
+}
+
+// 新增模板信息
+export function addProject(data) {
+  return request({
+    url: '/system/project',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改模板信息
+export function updateProject(data) {
+  return request({
+    url: '/system/project',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除模板信息
+export function delProject(id) {
+  return request({
+    url: '/system/project/' + id,
+    method: 'delete'
+  })
+}

src/api/system/user.js

@@ -142,3 +142,11 @@ export function deptTreeSelect() {
     method: 'get'
   })
 }
+
+// 查询用户列表
+export function listAllUser() {
+  return request({
+    url: '/system/user/listAll',
+    method: 'get'
+  })
+}

src/views/business/supplier/index.vue

@@ -33,6 +33,17 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <div class="el-form-item" v-hasPermi="['business:supplier:usermanager']">
+          <el-form-item label="管理人" prop="supplierManagers">
+              <el-input
+                v-model="queryParams.supplierManagers"
+                placeholder="姓名间用英文逗号隔开"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+          </el-form-item>
+      </div>
+      
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -92,8 +103,8 @@
       <el-table-column label="供应商地址" align="center" prop="supplierAddress" />
       <el-table-column label="供应商联系人" align="center" prop="supplierContact" />
       <el-table-column label="供应商联系方式" align="center" prop="supplierContactNum" />
-      <el-table-column label="认领人" align="center" />
-      <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
+      <!--<el-table-column label="认领人" align="center" /> -->
+      <el-table-column label="备注" align="center" prop="remark" /> 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -141,6 +152,35 @@
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
       </el-form>
+
+      <!-- 管理人员信息表格 -->
+      <div ref="userManagerDiv" class="manager-table" v-hasPermi="['business:supplier:usermanager']">
+        <h3>管理人员信息</h3>
+        <el-table :data="filteredDockerUsers" border style="width: 100%">
+          <el-table-column prop="userName" label="用户账号" width="100"></el-table-column>
+          <el-table-column prop="nickName" label="用户昵称" width="100"></el-table-column>
+             <el-table-column label="操作" width="100">
+            <template slot-scope="scope">
+              <el-button size="mini" type="text" @click="removeManager(scope.$index)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <!-- 用户选择器 -->
+        <div class="user-selector">
+          <h3>选择管理人员</h3>
+          <el-select v-model="selectedUser" placeholder="请选择用户" @change="selectUser">
+            <el-option
+              v-for="user in users"
+              :key="user.userId"
+              :label="user.nickName"
+              :value="user"
+            >
+          
+          </el-option>
+          </el-select>
+        </div>
+      </div>
+
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -151,6 +191,11 @@
 
 <script>
 import { listSupplier, getSupplier, delSupplier, addSupplier, updateSupplier } from "@/api/business/supplier";
+import { listAllUser,listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
+
+
+import { getInfo} from "@/api/login";
+
 
 export default {
   name: "Supplier",
@@ -184,9 +229,19 @@ export default {
         supplierAddress: undefined,
         supplierContact: undefined,
         supplierContactNum: undefined,
+        supplierManagers: undefined,
       },
       // 表单参数
-      form: {},
+      form: {
+        supplierId: undefined,
+        supplierName: undefined,
+        supplierAddress: undefined,
+        supplierContact: undefined,
+        supplierContactNum: undefined,
+        supplierManagers: undefined,
+        remark: undefined,
+        dockerUsers: []
+      },
       // 表单校验
       rules: {
         supplierId: [
@@ -195,16 +250,48 @@ export default {
         supplierName: [
           { required: true, message: "供应商名称不能为空", trigger: "blur" }
         ]
-      }
+      },
+      selectedUser: null, // 当前选中的用户
+      users: [], // 用户列表
+      currentUser: null, // 当前用户信息
+      permissions: '' // 当前用户权限
     };
   },
-  created() {
-    this.getList();
+  computed: {
+    filteredDockerUsers() {
+      return this.form.dockerUsers.length ? this.form.dockerUsers.filter(dockerUser => dockerUser.del === null): [];
+    },
+    //...mapState('user', ['permissions'])
+  },
+  async created() {
+    
+    try {
+        const response = await getInfo();
+        this.currentUser = response.data.user;
+        this.permissions = response.data.permissions;
+
+        console.log(response.data);
+
+        // 在异步操作完成后再调用 getList()
+        this.getList();
+    } catch (error) {
+        console.error('获取用户信息失败', error);
+    }
   },
   methods: {
     /** 查询供应商信息列表 */
     getList() {
       this.loading = true;
+ 
+      if (this.hasPermission("*:*:*") || this.hasPermission('business:supplier:usermanager')){
+          this.queryParams.supplierManagers = '';
+          //console.log("超级管理员");
+      
+      } else {
+          this.queryParams.supplierManagers = this.currentUser.nickName;
+          //console.log(this.currentUser.nickName + "  123");
+      }
+
       listSupplier(this.queryParams).then(response => {
         this.supplierList = response.rows;
         this.total = response.total;
@@ -213,8 +300,9 @@ export default {
     },
     // 取消按钮
     cancel() {
-      this.open = false;
+       this.open = false;   
       this.reset();
+  
     },
     // 表单重置
     reset() {
@@ -224,7 +312,11 @@ export default {
         supplierAddress: undefined,
         supplierContact: undefined,
         supplierContactNum: undefined,
-        remark: undefined
+        supplierManagers: undefined,
+        remark: undefined,
+        dockerUsers: [],
+        currentUser:undefined,
+        permissions:''
       };
       this.resetForm("form");
     },
@@ -247,27 +339,36 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.fetchUsers();
       this.open = true;
       this.title = "添加供应商信息";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      //console.log(row);
+      
       this.loading = true;
       this.reset();
+
+      this.fetchUsers();
+
       const supplierId = row.supplierId || this.ids
       getSupplier(supplierId).then(response => {
         this.loading = false;
         this.form = response.data;
+        //console.log(response.data);
         this.open = true;
         this.title = "修改供应商信息";
       });
     },
     /** 提交按钮 */
     submitForm() {
+      console.log("submitForm");
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.buttonLoading = true;
           if (this.form.supplierId != null) {
+            console.log("updateSupplier");
             updateSupplier(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -276,6 +377,9 @@ export default {
               this.buttonLoading = false;
             });
           } else {
+            console.log("addSupplier");
+            this.setDefaultUserManager(); // 设置默认的管理人员
+            console.log("addSupplier1");
             addSupplier(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
@@ -307,7 +411,63 @@ export default {
       this.download('business/supplier/export', {
         ...this.queryParams
       }, `supplier_${new Date().getTime()}.xlsx`)
-    }
+    },
+   
+    // 删除管理人员
+    removeManager(index) {
+      //console.log(this.form.dockerUsers);
+      //this.form.dockerUsers.splice(index, 1);
+      this.form.dockerUsers[index].del = 1;
+      //console.log(this.form.dockerUsers);
+    },
+    // 获取用户列表
+    fetchUsers() {
+      if (this.hasPermission("*:*:*")||(this.hasPermission("system:user:list") && this.hasPermission("business:supplier:usermanager"))){
+          listAllUser().then(response => {
+          this.users = response.data;
+          //console.log(response.data);
+          });
+      }
+  
+    },
+    // 选择用户
+    selectUser(user) {
+      const isInArray = this.form.dockerUsers.some(obj => obj.userId === user.userId );
+      if (isInArray==false) {
+          this.form.dockerUsers.push({
+            userId: user.userId,
+            userName: user.userName,
+            nickName: user.nickName,
+            del: null
+          });
+      }
+      this.selectedUser = null; // 清空选中用户
+    },
+    hasPermission(permission) {
+      return this.permissions.includes(permission);
+    },
+
+    setDefaultUserManager(){
+      console.log("setDefaultUserManager");
+      const div = this.$refs.userManagerDiv;
+      console.log("setDefaultUserManager1");
+      if (div) { //div 不可见时，设定供应商的管理人员为当前用户
+        console.log("has div");
+        if (div.style.display !== 'none'){
+            this.form.dockerUsers.push({
+            userId: this.currentUser.userId,
+            userName: this.currentUser.userName,
+            nickName: this.currentUser.nickName,
+            del: null
+            });
+            console.log("userManagerDiv 不可见");
+        }else{
+          console.log("userManagerDiv 可见");
+        }
+        
+      }
   }
+  },
+  
 };
 </script>

src/views/system/project/index.vue

@@ -0,0 +1,314 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="对接人Id" prop="dockerUserId">
+        <el-input
+          v-model="queryParams.dockerUserId"
+          placeholder="请输入对接人Id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否采用" prop="adoptFlag">
+        <el-input
+          v-model="queryParams.adoptFlag"
+          placeholder="请输入是否采用"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设计生产数量" prop="designAmount">
+        <el-input
+          v-model="queryParams.designAmount"
+          placeholder="请输入设计生产数量"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:project:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:project:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:project:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:project:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="projectList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="模板Id" align="center" prop="id" v-if="true"/>
+      <el-table-column label="模板信息" align="center" prop="projectInfo" />
+      <el-table-column label="对接人Id" align="center" prop="dockerUserId" />
+      <el-table-column label="是否采用" align="center" prop="adoptFlag" />
+      <el-table-column label="设计生产数量" align="center" prop="designAmount" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:project:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:project:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改模板信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="对接人Id" prop="dockerUserId">
+          <el-input v-model="form.dockerUserId" placeholder="请输入对接人Id" />
+        </el-form-item>
+        <el-form-item label="是否采用" prop="adoptFlag">
+          <el-input v-model="form.adoptFlag" placeholder="请输入是否采用" />
+        </el-form-item>
+        <el-form-item label="设计生产数量" prop="designAmount">
+          <el-input v-model="form.designAmount" placeholder="请输入设计生产数量" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listProject, getProject, delProject, addProject, updateProject } from "@/api/system/project";
+
+export default {
+  name: "Project",
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 模板信息表格数据
+      projectList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        dockerUserId: undefined,
+        adoptFlag: undefined,
+        designAmount: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        id: [
+          { required: true, message: "模板Id不能为空", trigger: "blur" }
+        ],
+        dockerUserId: [
+          { required: true, message: "对接人Id不能为空", trigger: "blur" }
+        ],
+        adoptFlag: [
+          { required: true, message: "是否采用不能为空", trigger: "blur" }
+        ],
+        designAmount: [
+          { required: true, message: "设计生产数量不能为空", trigger: "blur" }
+        ],
+        delFlag: [
+          { required: true, message: "逻辑删除标志不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询模板信息列表 */
+    getList() {
+      this.loading = true;
+      listProject(this.queryParams).then(response => {
+        this.projectList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        projectInfo: undefined,
+        dockerUserId: undefined,
+        adoptFlag: undefined,
+        designAmount: undefined,
+        createBy: undefined,
+        createTime: undefined,
+        updateBy: undefined,
+        updateTime: undefined,
+        remark: undefined,
+        delFlag: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加模板信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const id = row.id || this.ids
+      getProject(id).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改模板信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.id != null) {
+            updateProject(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addProject(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除模板信息编号为"' + ids + '"的数据项？').then(() => {
+        this.loading = true;
+        return delProject(ids);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/project/export', {
+        ...this.queryParams
+      }, `project_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/workflow/work/all.vue

@@ -1,19 +1,43 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="流程标识" prop="processKey">
+      
+      <!--
+      <el-form-item label="流程编号" prop="processKey">
         <el-input
-          v-model="queryParams.processKey"
-          placeholder="请输入流程标识"
+          v-model="queryParams.processKey"          
+          placeholder="请输入流程编号"
+          clearable 
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> 
+
+      <el-form-item label="流程名称" prop="processName">
+        <el-input
+          v-model="queryParams.processName"
+          placeholder="请输入流程名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="流程名称" prop="processName">
+    -->
+
+    <el-form-item label="批次" prop="specBatch">
         <el-input
-          v-model="queryParams.processName"
-          placeholder="请输入流程名称"
+          v-model="queryParams.specBatch"          
+          placeholder="请输入批次"
+          clearable 
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="规格名称" prop="query-specName">
+        <el-input
+          v-model="queryParams.specName"
+          placeholder="请输入规格名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -64,7 +88,7 @@
           plain
           icon="el-icon-download"
           size="mini"
-          v-hasPermi="['workflow:process:ownExport']"
+          v-hasPermi="['workflow:process:allExport']"
           @click="handleExport"
         >导出</el-button>
       </el-col>
@@ -73,8 +97,10 @@
 
     <el-table v-loading="loading" :data="ownProcessList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="流程编号" align="center" prop="procInsId" :show-overflow-tooltip="true"/>
-      <el-table-column label="流程名称" align="center" prop="procDefName" :show-overflow-tooltip="true"/>
+      <!-- <el-table-column label="流程编号" align="center" prop="procInsId" :show-overflow-tooltip="true"/> -->
+      <!-- <el-table-column label="流程名称" align="center" prop="procDefName" :show-overflow-tooltip="true"/> -->
+      <el-table-column label="规格批次" align="center" prop="specBatch" :show-overflow-tooltip="true"/>
+      <el-table-column label="规格名称" align="center" prop="specName" :show-overflow-tooltip="true"/>
       <el-table-column label="流程类别" align="center" prop="category" :formatter="categoryFormat" />
       <el-table-column label="流程版本" align="center" width="80px">
         <template slot-scope="scope">
@@ -290,9 +316,9 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('workflow/process/ownExport', {
+      this.download('workflow/process/allExport', {
         ...this.queryParams
-      }, `wf_own_process_${new Date().getTime()}.xlsx`)
+      }, `wf_all_process_${new Date().getTime()}.xlsx`)
     },
     categoryFormat(row, column) {
       return this.categoryOptions.find(k => k.code === row.category)?.categoryName ?? '';

src/views/workflow/work/claim.vue

@@ -2,6 +2,8 @@
   <div class="app-container">
 
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+
+       <!--
       <el-form-item label="流程名称" prop="processName">
         <el-input
           v-model="queryParams.processName"
@@ -11,6 +13,28 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+
+      -->
+
+      <el-form-item label="批次" prop="specBatch">
+        <el-input
+          v-model="queryParams.specBatch"          
+          placeholder="请输入批次"
+          clearable 
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="规格名称" prop="specName">
+        <el-input
+          v-model="queryParams.specName"
+          placeholder="请输入规格名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="接收时间">
         <el-date-picker
           v-model="dateRange"
@@ -45,8 +69,10 @@
 
     <el-table v-loading="loading" :data="claimList">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="任务编号" align="center" prop="taskId" :show-overflow-tooltip="true"/>
-      <el-table-column label="流程名称" align="center" prop="procDefName"/>
+      <!-- <el-table-column label="流程编号" align="center" prop="procInsId" :show-overflow-tooltip="true"/> -->
+      <!-- <el-table-column label="流程名称" align="center" prop="procDefName" :show-overflow-tooltip="true"/> -->
+      <el-table-column label="规格批次" align="center" prop="specBatch" :show-overflow-tooltip="true"/>
+      <el-table-column label="规格名称" align="center" prop="specName" :show-overflow-tooltip="true"/>
       <el-table-column label="任务节点" align="center" prop="taskName"/>
       <el-table-column label="流程版本" align="center">
         <template slot-scope="scope">

src/views/workflow/work/copy.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+
+      <!--
       <el-form-item label="流程名称" prop="processName">
         <el-input
           v-model="queryParams.processName"
@@ -9,6 +11,30 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+
+      -->
+
+      <el-form-item label="批次" prop="specBatch">
+        <el-input
+          v-model="queryParams.specBatch"          
+          placeholder="请输入批次"
+          clearable 
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="规格名称" prop="specName">
+        <el-input
+          v-model="queryParams.specName"
+          placeholder="请输入规格名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      
       <el-form-item label="发起人" prop="originatorName">
         <el-input
           v-model="queryParams.originatorName"
@@ -39,9 +65,14 @@
 
     <el-table v-loading="loading" :data="copyList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="抄送编号" align="center" prop="copyId" />
+      
+      <!--<el-table-column label="抄送编号" align="center" prop="copyId" /> -->
+      <!-- <el-table-column label="流程名称" align="center" prop="processName" :show-overflow-tooltip="true" /> -->
+
+      <el-table-column label="规格批次" align="center" prop="specBatch" :show-overflow-tooltip="true"/>
+      <el-table-column label="规格名称" align="center" prop="specName" :show-overflow-tooltip="true"/>
+
       <el-table-column label="标题" align="center" prop="title" :show-overflow-tooltip="true" />
-      <el-table-column label="流程名称" align="center" prop="processName" :show-overflow-tooltip="true" />
       <el-table-column label="发起人" align="center" prop="originatorName" />
       <el-table-column label="创建时间" align="center" prop="createTime">
         <template slot-scope="scope">

src/views/workflow/work/finished.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      
+       <!--
       <el-form-item label="流程名称" prop="processName">
         <el-input
           v-model="queryParams.processName"
@@ -10,6 +12,29 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+
+      -->
+
+      <el-form-item label="批次" prop="specBatch">
+        <el-input
+          v-model="queryParams.specBatch"          
+          placeholder="请输入批次"
+          clearable 
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="规格名称" prop="specName">
+        <el-input
+          v-model="queryParams.specName"
+          placeholder="请输入规格名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      
       <el-form-item label="审批时间">
         <el-date-picker
           v-model="dateRange"
@@ -44,8 +69,13 @@
 
     <el-table v-loading="loading" :data="finishedList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="任务编号" align="center" prop="taskId" :show-overflow-tooltip="true"/>
-      <el-table-column label="流程名称" align="center" prop="procDefName" :show-overflow-tooltip="true"/>
+      
+      <!-- <el-table-column label="任务编号" align="center" prop="taskId" :show-overflow-tooltip="true"/> -->
+      <!-- <el-table-column label="流程名称" align="center" prop="procDefName" :show-overflow-tooltip="true"/> -->
+      
+      <el-table-column label="规格批次" align="center" prop="specBatch" :show-overflow-tooltip="true"/>
+      <el-table-column label="规格名称" align="center" prop="specName" :show-overflow-tooltip="true"/>
+
       <el-table-column label="任务节点" align="center" prop="taskName" />
       <el-table-column label="流程发起人" align="center">
         <template slot-scope="scope">

src/views/workflow/work/own.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      
+       <!--
       <el-form-item label="流程标识" prop="processKey">
         <el-input
           v-model="queryParams.processKey"
@@ -19,6 +21,28 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      -->
+
+      <el-form-item label="批次" prop="specBatch">
+        <el-input
+          v-model="queryParams.specBatch"          
+          placeholder="请输入批次"
+          clearable 
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="规格名称" prop="specName">
+        <el-input
+          v-model="queryParams.specName"
+          placeholder="请输入规格名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      
       <el-form-item label="流程分类" prop="category">
         <el-select v-model="queryParams.category" clearable placeholder="请选择" size="small">
           <el-option
@@ -73,8 +97,10 @@
 
     <el-table v-loading="loading" :data="ownProcessList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="流程编号" align="center" prop="procInsId" :show-overflow-tooltip="true"/>
-      <el-table-column label="流程名称" align="center" prop="procDefName" :show-overflow-tooltip="true"/>
+     <!-- <el-table-column label="流程编号" align="center" prop="procInsId" :show-overflow-tooltip="true"/> -->
+      <!-- <el-table-column label="流程名称" align="center" prop="procDefName" :show-overflow-tooltip="true"/> -->
+      <el-table-column label="规格批次" align="center" prop="specBatch" :show-overflow-tooltip="true"/>
+      <el-table-column label="规格名称" align="center" prop="specName" :show-overflow-tooltip="true"/>
       <el-table-column label="流程类别" align="center" prop="category" :formatter="categoryFormat" />
       <el-table-column label="流程版本" align="center" width="80px">
         <template slot-scope="scope">
@@ -290,7 +316,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('workflow/process/ownExport', {
+      this.download('workflow/process/allExport', {
         ...this.queryParams
       }, `wf_own_process_${new Date().getTime()}.xlsx`)
     },

src/views/workflow/work/todo.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      
+      <!--
       <el-form-item label="流程名称" prop="processName">
         <el-input
           v-model="queryParams.processName"
@@ -10,6 +12,28 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      -->
+
+      <el-form-item label="批次" prop="specBatch">
+        <el-input
+          v-model="queryParams.specBatch"          
+          placeholder="请输入批次"
+          clearable 
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="规格名称" prop="specName">
+        <el-input
+          v-model="queryParams.specName"
+          placeholder="请输入规格名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      
       <el-form-item label="接收时间">
         <el-date-picker
           v-model="dateRange"
@@ -44,8 +68,11 @@
 
     <el-table v-loading="loading" :data="todoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="任务编号" align="center" prop="taskId" :show-overflow-tooltip="true"/>
-      <el-table-column label="流程名称" align="center" prop="procDefName"/>
+      <!-- <el-table-column label="任务编号" align="center" prop="taskId" :show-overflow-tooltip="true"/> -->
+      <!-- <el-table-column label="流程名称" align="center" prop="procDefName"/> -->
+      <el-table-column label="规格批次" align="center" prop="specBatch" :show-overflow-tooltip="true"/>
+      <el-table-column label="规格名称" align="center" prop="specName" :show-overflow-tooltip="true"/>
+      
       <el-table-column label="任务节点" align="center" prop="taskName"/>
       <el-table-column label="流程版本" align="center">
         <template slot-scope="scope">