1.生产管理、报表管理引入分车间概念

loulijun2021

2023-06-17 ff76b3ed3494474e9301c49cf635f1553d49ecc5

 src/views/reportManager/groupSalaryList.vue

@@ -40,6 +40,16 @@
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="生产车间" style=" display: flex;">
              <el-select v-model="form.wkshopcode" style="width: 200px" placeholder="请选择">
                <el-option
                  v-for="item in WorkShopArr"
                  :key="item.code"
                  :label="item.name"
                  :value="item.code"
                />
              </el-select>
            </el-form-item>
            <el-form-item label="工单编号" style="display: flex;">
              <el-input v-model="form.wocode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
@@ -49,9 +59,9 @@
            <el-form-item label="产品名称" style=" display: flex;">
              <el-input v-model="form.partname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item label="规格型号" style=" display: flex;">
              <el-input v-model="form.partspec" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <!--            <el-form-item label="规格型号" style=" display: flex;">-->
            <!--              <el-input v-model="form.partspec" style="width: 200px" placeholder="请输入" />-->
            <!--            </el-form-item>-->
            <el-form-item v-show="isExpandForm" label="工序名称" style="display: flex;">
              <el-input v-model="form.stepname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
@@ -190,6 +200,18 @@
                show-tooltip-when-overflow
                sortable="custom"
              />
              <el-table-column
                prop="wkshp_name"
                label="生产车间"
                width="110"
                show-tooltip-when-overflow
                sortable="custom"
              >
                <template slot-scope="{row}">
                  <div v-if="row.wkshp_name">{{ row.wkshp_name }}</div>
                  <div v-else>/</div>
                </template>
              </el-table-column>
              <el-table-column
                prop="group_name"
                label="生产班组"
@@ -355,6 +377,18 @@
                sortable="custom"
              />
              <el-table-column
                prop="wkshp_name"
                label="生产车间"
                width="110"
                show-tooltip-when-overflow
                sortable="custom"
              >
                <template slot-scope="{row}">
                  <div v-if="row.wkshp_name">{{ row.wkshp_name }}</div>
                  <div v-else>/</div>
                </template>
              </el-table-column>
              <el-table-column
                prop="group_name"
                label="生产班组"
                width="110"
@@ -502,6 +536,7 @@
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import { StepSelect } from '@/api/makeModel'
import { WorkShopSelect } from '@/api/deviceManager'

export default {
  name: 'Zzjg',
@@ -524,6 +559,7 @@
        stepname: '', // 工序名称
        groupcode: '', // 生产班组
        username: '', // 操作人员
        wkshopcode: this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '', // 所属车间
        operdate: '', // 操作时间
        rejectstepcode: [], // 剔除工序(固定薪资工序不参与计算
        compute: 'last', // 计件方式  逐道工序：contin   末道工序：last
@@ -558,6 +594,8 @@

      },

      WorkShopArr: [], // 所属车间数组

      title_value: '数据导入 / 点检部位',
      code: '4',
      shows: false
@@ -589,9 +627,15 @@
      this.getGroupSalaryReportSearch().then(res => {
        if (res.code === '200') {
          this.getMesOrderStepReportSelectUserGroup()
          this.getStepSelect()
          this.getWorkShopSelect()
          // this.getStepSelect()
        }
      })
    },
    // 获取所属车间下拉
    async getWorkShopSelect() {
      const { data: res } = await WorkShopSelect()
      this.WorkShopArr = res
    },
    // 获取工序下拉接口
    async getStepSelect() {
@@ -643,6 +687,7 @@
        stepname: this.form.stepname,
        groupcode: this.form.groupcode,
        username: this.form.username,
        wkshopcode: this.form.wkshopcode,
        operdate: tempDate,
        rejectstepcode: this.form.rejectstepcode.join(','),
        compute: this.form.compute,
@@ -666,7 +711,7 @@
    },

    async getMesOrderStepReportSelectUserGroup() {
      const { data: res } = await MesOrderStepReportSelectUserGroup()
      const { data: res } = await MesOrderStepReportSelectUserGroup({ wkshopcode: this.form.wkshopcode })
      this.groupArr = res
    },
    tabClick(val) {
@@ -701,6 +746,7 @@
        stepname: this.form.stepname,
        groupcode: this.form.groupcode,
        username: this.form.username,
        wkshopcode: this.form.wkshopcode,
        operdate: tempDate,
        compute: this.form.compute
      }
@@ -730,81 +776,8 @@
      this.form.groupcode = ''
      this.form.username = ''
      this.form.operdate = ''
      this.form.wkshopcode = this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '' // 所属车间
      this.getGroupSalaryReportSearch()
    },

    // 新增按钮
    add(operation) {
      this.operation = operation
      this.dialogVisible = true
    },
    // 修改按钮
    async edit(operation, row) {
      this.operation = operation
      this.dialogVisible = true

      const res = await GroupSalaryReportSearchUser({ id: row.id })
      this.tagArr = res.data.map(r => r.username)
      // this.tagArr = ['楼李俊', '张三', '李四']
      // this.$nextTick(() => {
      //   this.dialogForm.OrgCode = row.org_code
      //   this.dialogForm.OrgName = row.org_name
      //   this.dialogForm.SupUnit = row.parent_id
      // })
    },
    // 删除按钮
    async del(row) {
      // this.$confirm('是否确认删除?', '提示', {
      //   confirmButtonText: '确定',
      //   cancelButtonText: '取消',
      //   type: 'warning'
      // }).then(() => {
      //   DeleteOrganization({ orgid: row.code }).then(res => {
      //     if (res.code === '200') {
      //       this.$message.success('删除成功!')
      //       if (this.form.page > 1 && this.tableData.length === 1) {
      //         this.form.page--
      //       }
      //       this.getGroupSalaryReportSearch()
      //     }
      //   })
      // }).catch(() => {
      //   this.$message.info('已取消删除')
      // })
    },
    // 对话框关闭事件
    handleClose() {
      this.dialogForm.OrgType = ''
      this.dialogForm.OrgCode = ''
      this.dialogForm.OrgName = ''
      this.dialogForm.SupUnit = ''
      this.$refs.dialogForm.clearValidate()
    },
    // 对话框取消
    dialogVisibleCancel() {
      this.dialogVisible = false
    },
    // 对话框确认
    dialogVisibleConfirm() {
      this.$refs.dialogForm.validate(valid => {
        if (valid) {
          const data = {
            OrganCode: this.dialogForm.OrgCode,
            OrganName: this.dialogForm.OrgName,
            OperType: this.operation === 'add' ? 'Add' : 'Update',
            Operator: getCookie('admin')
          }
          // AddUpdateOrganization(data).then(res => {
          //   if (res.code === '200') {
          //     this.$message.success(this.operation === 'add' ? '添加成功！' : '修改成功！')
          //     this.dialogVisible = false
          //     this.getGroupSalaryReportSearch()
          //   } else {
          //     this.$message.error(this.operation === 'add' ? '添加失败！' : '修改失败！')
          //   }
          // })
        }
      })
    },
    // 获取页面高度
    getHeight() {