报表管理

src/api/mes/proTable/productProcess.js

+import request from '@/utils/request'
+
+// 生产进度:明细界面
+export function getList(query) {
+  return request({
+    url: "/report/pro/workOrderProgress/getList",
+    method: "get",
+    params: query,
+  });
+}
+
+
+// 生产进度:报工明细
+export function getFeedbackList(query) {
+  return request({
+    url: '/report/pro/workOrderProgress/getFeedbackList',
+    method: "get",
+    params: query
+  });
+}
+
+// 生产进度:工序明细
+export function getProcessList(query) {
+    return request({
+      url: '/report/pro/workOrderProgress/getProcessList',
+      method: "get",
+      params: query
+    });
+  }
\ No newline at end of file

src/api/mes/proTable/statistAnaly.js

+import request from '@/utils/request'
+
+// 生产报工记录:明细界面
+export function getList(query) {
+  return request({
+    url: "/report/pro/feedback/getList",
+    method: "get",
+    params: query,
+  });
+}
+
+
+// 生产报工记录:统计方式工序
+export function getListByProcess(query) {
+  return request({
+    url: '/report/pro/feedback/getListByProcess',
+    method: "get",
+    params: query
+  });
+}
+
+// 生产报工记录:统计方式用户
+export function getListByUser(query) {
+    return request({
+      url: '/report/pro/feedback/getListByUser',
+      method: "get",
+      params: query
+    });
+  }
+  // 生产报工记录:统计方式车间
+export function getListByWorkshop(query) {
+    return request({
+      url: '/report/pro/feedback/getListByWorkshop',
+      method: "get",
+      params: query
+    });
+  }
+
+// 生产报工记录:统计方式工单
+export function getListByWorkOrder(query) {
+    return request({
+      url: '/report/pro/feedback/getListByWorkOrder',
+      method: "get",
+      params: query
+    });
+  }
+
+  // 生产报工记录:统计方式工作中心
+export function getListByWorkstation(query) {
+    return request({
+      url: '/report/pro/feedback/getListByWorkstation',
+      method: "get",
+      params: query
+    });
+  }
+
+    // 生产报工记录:统计方式工作单元
+export function getListByWorkunit(query) {
+    return request({
+      url: '/report/pro/feedback/getListByWorkunit',
+      method: "get",
+      params: query
+    });
+  }
+
+// 生产报工记录:统计方式不合格原因
+export function getListByDefect(query) {
+  return request({
+    url: '/report/pro/feedback/getListByDefect',
+    method: "get",
+    params: query
+  });
+}
\ No newline at end of file

src/components/userSelect/single1.vue

+<template>
+  <el-dialog :title="'人员选择'"
+    v-if="showFlag"
+    :visible.sync="showFlag"
+    :modal= showModal
+    width="80%"
+    center
+  >
+    <el-row :gutter="20">
+      <!--部门数据-->
+      <el-col :span="4" :xs="24">
+        <div class="head-container">
+          <el-input
+            v-model="deptName"
+            :placeholder="'请输入部门名称'"
+            clearable
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
+        </div>
+        <div class="head-container">
+          <el-tree
+            :data="deptOptions"
+            :props="defaultProps"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="tree"
+            default-expand-all
+            @node-click="handleNodeClick"
+          />
+        </div>
+      </el-col>
+      <!--用户数据-->
+      <el-col :span="20" :xs="24">
+        <el-form :model="queryParams" @submit.native.prevent ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item :label="'用户名称'" prop="userName">
+            <el-input
+              v-model="queryParams.userName"
+              :placeholder="'请输入用户名称'"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item :label="'用户昵称'" prop="nickName">
+            <el-input
+              v-model="queryParams.nickName"
+              clearable
+              style="width: 240px"
+              @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-table v-loading="loading" :data="userList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
+            <el-table-column  width="55" align="center" >
+                <template v-slot="scope">
+                    <el-radio v-model="selectedId" :label="scope.row.userId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
+                </template>
+            </el-table-column>
+          <el-table-column :label="'用户名称'" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column :label="'用户昵称'" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+    <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
+        <el-button @click="showFlag=false">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+
+
+import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus } from "@/api/system/user";
+import { getToken } from "@/utils/auth";
+import { treeselect } from "@/api/system/dept";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "UserSingleSelect",
+  dicts: ['sys_normal_disable', 'sys_user_sex'],
+  props: {
+    showModal: {
+      default: false
+    }
+  },
+  components: { Treeselect },
+  data() {
+    return {
+      showFlag:false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      selectedId: null,
+      selectedRow: null,
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      userList: null,
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      // 是否显示弹出层
+      open: false,
+      // 部门名称
+      deptName: undefined,
+
+      // 日期范围
+      dateRange: [],
+      // 岗位选项
+      postOptions: [],
+      // 角色选项
+      roleOptions: [],
+      // 表单参数
+      form: {},
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userName: undefined,
+        nickName: undefined,
+        status: undefined,
+        deptId: undefined
+      },
+      // 列信息
+      columns: [
+        { key: 0, label: '用户编号', visible: true },
+        { key: 1, label: '用户名称', visible: true },
+        { key: 2, label: '用户昵称', visible: true },
+        { key: 3, label: '部门', visible: true },
+        { key: 4, label: '手机号码', visible: true },
+        { key: 5, label: '状态', visible: true },
+        { key: 6, label: '创建时间', visible: true }
+      ],
+    };
+  },
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  created() {
+    this.getList();
+    this.getTreeselect();
+  },
+  methods: {
+    /** 查询用户列表 */
+    getList() {
+      this.loading = true;
+      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+          this.userList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    /** 查询部门下拉树结构 */
+    getTreeselect() {
+      treeselect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.deptId = data.id;
+      this.handleQuery();
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleCurrent(row){
+        if(row){
+            this.selectedRow = row;
+        }
+    },
+    //行双击选中
+    handleRowDbClick(row){
+      if(row){
+        this.selectedRow = row;
+        this.$emit('onSelected',this.selectedRow);
+        this.showFlag = false;
+      }
+    },
+    // 单选选中数据
+    handleRowChange(row) {
+      debugger;
+      if(row){
+        this.selectedRow = row;
+      }
+    },
+    //确定选中
+    confirmSelect(){
+        if(this.selectedId == null || this.selectedId == 0){
+            this.$notify({
+                title:'提示',
+                type:'warning',
+                message: '请至少选择一条数据'
+            });
+            return;
+        }
+        this.$emit('onSelected',this.selectedRow);
+        this.showFlag = false;
+    }
+  }
+};
+</script>

src/components/workshopSelect/single.vue

+<template>
+  <el-dialog :title="'车间选择'"
+    v-if="showFlag"
+    :visible.sync="showFlag"
+    :modal="showModal"
+    width="80%"
+    center
+  >
+    <el-row :gutter="20">
+      <!--设备数据-->
+      <el-col :span="24" :xs="24">
+        <el-form :model="queryParams" @submit.native.prevent ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item :label="'车间编码'" prop="workshopCode">
+            <el-input
+              v-model="queryParams.workshopCode"
+             
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item :label="'车间名称'" prop="workshopName">
+            <el-input
+              v-model="queryParams.workshopName"
+             
+              clearable
+              style="width: 240px"
+              @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-table v-loading="loading" :data="machineryList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
+          <el-table-column width="50" align="center" >
+            <template v-slot="scope">
+                <el-radio v-model="selectedMachineryId" :label="scope.row.workshopId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
+            </template>
+          </el-table-column>
+          <el-table-column :label="'车间编码'" width = "120" align="center" key="workshopCode" prop="workshopCode">
+          </el-table-column>
+          <el-table-column :label="'车间名称'" min-width="120" align="left" key="workshopName" prop="workshopName" :show-overflow-tooltip="true" />
+          <el-table-column :label="'创建人'" min-width="120" align="left" key="createBy" prop="createBy" :show-overflow-tooltip="true" />
+          <el-table-column :label="'创建时间'" min-width="120" align="left" key="createTime" prop="createTime" :show-overflow-tooltip="true" />
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+    <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
+        <el-button @click="showFlag=false">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+
+
+
+import { listWorkshop } from "@/api/mes/md/workshop";
+
+import { getToken } from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "MachinerySelectSingle",
+  dicts: ['sys_yes_no','mes_machinery_status'],
+  components: { Treeselect },
+  props: {
+    showModal: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      showFlag: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      selectedMachineryId: undefined,
+      selectedRows: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 物料产品表格数据
+      machineryList: [],
+      // 弹出层标题
+      title: "",
+      // 设备类型树选项
+      machineryTypeOptions: [],
+      //车间选项
+      workshopOptions:[],
+      // 是否显示弹出层
+      open: false,
+      // 设备类型名称
+      machineryTypeName: undefined,
+      //自动生成物料编码标识
+      autoGenFlag: false,
+      // 表单参数
+      form: {},
+      defaultProps: {
+        children: "children",
+        label: "machineryTypeName"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        workshopCode: null,
+        workshopName: null,
+        machineryBrand: null,
+        machinerySpec: null,
+        machineryTypeId: null,
+        machineryTypeCode: null,
+        machineryTypeName: null,
+        workshopId: null,
+        status: null
+      }
+    };
+  },
+  watch: {
+    // 根据设备分类名称筛选分类树
+    machineryTypeName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询物料编码列表 */
+    getList() {
+      this.loading = true;
+      listWorkshop(this.queryParams).then(response => {
+          this.machineryList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    /** 转换设备类型数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.machineryTypeId,
+        label: node.machineryTypeName,
+        children: node.children
+      };
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.machineryTypeName.indexOf(value) !== -1;
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleCurrent(row){
+        if(row){
+            this.selectedRows = row;
+        }
+    },
+    //双击选中
+    handleRowDbClick(row){
+      if(row){
+        this.selectedRows = row;
+        this.$emit('onSelected',this.selectedRows);
+        this.showFlag = false;
+      }
+    },
+    // 单选选中数据
+    handleRowChange(row) {
+      if(row){
+        this.selectedRows = row;
+      }
+    },
+    //确定选中
+    confirmSelect(){
+        if(this.selectedMachineryId == null || this.selectedMachineryId == 0){
+            this.$notify({
+                title:'提示',
+                type:'warning',
+                message: '请至少选择一条数据!'
+            });
+            return;
+        }
+        this.$emit('onSelected',this.selectedRows);
+        this.showFlag = false;
+    }
+  }
+};
+</script>
\ No newline at end of file