loulijun2021
2023-11-02 e20c8cf7ad6d2a85817c5627fc9ee7c755884d5b
1.统计报表  加上车间名称的查询条件
已修改6个文件
253 ■■■■■ 文件已修改
src/views/statistic/defectDetailList.vue 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/statistic/groupSalaryList.vue 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/statistic/personSalaryList.vue 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/statistic/repairDetailList.vue 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/statistic/subcontractingOperation.vue 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/statistic/workOrderProcess.vue 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/statistic/defectDetailList.vue
@@ -14,6 +14,22 @@
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="车间名称" style=" display: flex;">
              <el-select
                v-model="form.wkshopcode"
                filterable
                :popper-append-to-body="false"
                style="width: 200px"
                placeholder="请选择"
              >
                <el-option
                  v-for="item in wkshopcodeArr"
                  :key="item.torg_code"
                  :label="item.torg_name"
                  :value="item.torg_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>
@@ -23,7 +39,7 @@
            <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-form-item v-show="isExpandForm" 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;">
@@ -134,6 +150,13 @@
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="wkshp_name"
            label="车间名称"
            width="130"
            show-tooltip-when-overflow
            sortable="custom"
          />
          <el-table-column
            prop="stepcode"
            label="工序编码"
@@ -264,6 +287,7 @@
} from '@/api/ReportManager'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
export default {
  name: 'Zzjg',
@@ -278,6 +302,7 @@
      mainHeight: 0,
      tableHeight: 0,
      form: {
        wkshopcode: '',
        wocode: '', // 工单编号
        partcode: '', // 产品编码
        partname: '', // 产品名称
@@ -293,6 +318,7 @@
        rows: 20 // 每页多少条
      },
      // groupArr: [],
      wkshopcodeArr: [],
      total: 10,
      tableData: [],
      dialogVisible: false,
@@ -340,10 +366,14 @@
  methods: {
    handleRequest() {
      this.getDefectDetailsReportSearch().then(res => {
        // if (res.code === '200') {
        //   this.getMesOrderStepReportSelectUserGroup()
        // }
        if (res.code === '200') {
          this.getPrentOrganizationNoCompany()
        }
      })
    },
    async getPrentOrganizationNoCompany() {
      const { data: res } = await PrentOrganizationNoCompany()
      this.wkshopcodeArr = res
    },
    async getDefectDetailsReportSearch() {
      let tempDate = this.form.reportdate
@@ -351,6 +381,7 @@
        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      }
      const data = {
        wkshopcode: this.form.wkshopcode,
        wocode: this.form.wocode,
        partcode: this.form.partcode,
        partname: this.form.partname,
@@ -397,6 +428,7 @@
      }
      const data = {
        wkshopcode: this.form.wkshopcode,
        wocode: this.form.wocode,
        partcode: this.form.partcode,
        partname: this.form.partname,
@@ -425,6 +457,7 @@
    },
    // 重置
    reset() {
      this.form.wkshopcode = ''
      this.form.wocode = ''
      this.form.partcode = ''
      this.form.partname = ''
src/views/statistic/groupSalaryList.vue
@@ -40,6 +40,22 @@
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="车间名称" style=" display: flex;">
              <el-select
                v-model="form.wkshopcode"
                filterable
                :popper-append-to-body="false"
                style="width: 200px"
                placeholder="请选择"
              >
                <el-option
                  v-for="item in wkshopcodeArr"
                  :key="item.torg_code"
                  :label="item.torg_name"
                  :value="item.torg_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 +65,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>
@@ -68,7 +84,7 @@
            <el-form-item v-show="isExpandForm" label="操作人员" style=" display: flex;">
              <el-input v-model="form.username" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="报工时间" style="display: flex;align-items: center">
            <el-form-item v-show="isExpandForm" label="操作时间" style="display: flex;align-items: center">
              <el-date-picker
                v-model="form.operdate"
                type="daterange"
@@ -169,6 +185,13 @@
                  <div v-else>/</div>
                </template>
              </el-table-column>
              <el-table-column
                prop="wkshp_name"
                label="生产车间"
                width="110"
                show-tooltip-when-overflow
                sortable="custom"
              />
              <el-table-column
                prop="stepcode"
                label="工序编码"
@@ -333,6 +356,13 @@
                  <div v-else>/</div>
                </template>
              </el-table-column>
              <el-table-column
                prop="wkshp_name"
                label="生产车间"
                width="110"
                show-tooltip-when-overflow
                sortable="custom"
              />
              <el-table-column
                prop="stepcode"
                label="工序编码"
@@ -500,7 +530,7 @@
} from '@/api/ReportManager'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import { GroupsPermissions } from '@/api/GeneralBasicData'
import { GroupsPermissions, PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
export default {
  name: 'Zzjg',
@@ -516,6 +546,7 @@
      tableHeight: 0,
      StepSelectArr: [], // 剔除工序数组
      form: {
        wkshopcode: '',
        wocode: '', // 工单编号
        partcode: '', // 产品编码
        partname: '', // 产品名称
@@ -531,6 +562,7 @@
        page: 1, // 第几页
        rows: 20 // 每页多少条
      },
      wkshopcodeArr: [],
      groupArr: [],
      total: 10,
      tableData: [],
@@ -588,9 +620,14 @@
      this.getGroupSalaryReportSearch().then(res => {
        if (res.code === '200') {
          this.getMesOrderStepReportSelectUserGroup()
          this.getPrentOrganizationNoCompany()
          // this.getStepSelect()
        }
      })
    },
    async getPrentOrganizationNoCompany() {
      const { data: res } = await PrentOrganizationNoCompany()
      this.wkshopcodeArr = res
    },
    // 获取工序下拉接口
    // async getStepSelect() {
@@ -635,6 +672,7 @@
        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      }
      const data = {
        wkshopcode: this.form.wkshopcode,
        wocode: this.form.wocode,
        partcode: this.form.partcode,
        partname: this.form.partname,
@@ -693,6 +731,7 @@
      }
      const data = {
        wkshopcode: this.form.wkshopcode,
        wocode: this.form.wocode,
        partcode: this.form.partcode,
        partname: this.form.partname,
@@ -721,6 +760,7 @@
    },
    // 重置
    reset() {
      this.form.wkshopcode = ''
      this.form.wocode = ''
      this.form.partcode = ''
      this.form.partname = ''
src/views/statistic/personSalaryList.vue
@@ -40,6 +40,22 @@
          style="display: flex; "
        >
          <div class="elForm">
            <el-form-item label="车间名称" style=" display: flex;">
              <el-select
                v-model="form.wkshopcode"
                filterable
                :popper-append-to-body="false"
                style="width: 200px"
                placeholder="请选择"
              >
                <el-option
                  v-for="item in wkshopcodeArr"
                  :key="item.torg_code"
                  :label="item.torg_name"
                  :value="item.torg_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,7 +65,7 @@
            <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-form-item v-show="isExpandForm" 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;">
@@ -168,6 +184,14 @@
                  <div v-else>/</div>
                </template>
              </el-table-column>
              <el-table-column
                prop="wkshp_name"
                label="车间名称"
                width="130"
                show-tooltip-when-overflow
                sortable="custom"
              />
              <el-table-column
                prop="step_code"
                label="工序编码"
@@ -327,6 +351,14 @@
                </template>
              </el-table-column>
              <el-table-column
                prop="wkshp_name"
                label="车间名称"
                width="130"
                show-tooltip-when-overflow
                sortable="custom"
              />
              <el-table-column
                prop="step_code"
                label="工序编码"
                width="110"
@@ -473,6 +505,7 @@
} from '@/api/ReportManager'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
export default {
  name: 'Zzjg',
@@ -488,6 +521,7 @@
      tableHeight: 0,
      StepSelectArr: [], // 剔除工序数组
      form: {
        wkshopcode: '',
        wocode: '', // 工单编号
        partcode: '', // 产品编码
        partname: '', // 产品名称
@@ -503,6 +537,7 @@
        page: 1, // 第几页
        rows: 20 // 每页多少条
      },
      wkshopcodeArr: [],
      groupArr: [],
      total: 10,
      tableData: [],
@@ -559,10 +594,16 @@
    handleRequest() {
      this.getPeopleSalaryReportSearch().then(res => {
        if (res.code === '200') {
          this.getPrentOrganizationNoCompany()
          // this.getMesOrderStepReportSelectUserGroup()
          // this.getStepSelect()
        }
      })
    },
    async getPrentOrganizationNoCompany() {
      const { data: res } = await PrentOrganizationNoCompany()
      this.wkshopcodeArr = res
    },
    // 获取工序下拉接口
    // async getStepSelect() {
@@ -615,6 +656,7 @@
        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      }
      const data = {
        wkshopcode: this.form.wkshopcode,
        wocode: this.form.wocode,
        partcode: this.form.partcode,
        partname: this.form.partname,
@@ -672,6 +714,7 @@
      }
      const data = {
        wkshopcode: this.form.wkshopcode,
        wocode: this.form.wocode,
        partcode: this.form.partcode,
        partname: this.form.partname,
@@ -700,6 +743,7 @@
    },
    // 重置
    reset() {
      this.form.wkshopcode = ''
      this.form.wocode = ''
      this.form.partcode = ''
      this.form.partname = ''
@@ -788,7 +832,7 @@
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 85
        this.tableHeight = this.mainHeight - 255
        this.tableHeight = this.mainHeight - 245
        this.$refs.tableDataRef.doLayout()
        this.$refs.tableDataRef2.doLayout()
      })
src/views/statistic/repairDetailList.vue
@@ -14,6 +14,22 @@
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="车间名称" style=" display: flex;">
              <el-select
                v-model="form.wkshopcode"
                filterable
                :popper-append-to-body="false"
                style="width: 200px"
                placeholder="请选择"
              >
                <el-option
                  v-for="item in wkshopcodeArr"
                  :key="item.torg_code"
                  :label="item.torg_name"
                  :value="item.torg_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>
@@ -23,7 +39,7 @@
            <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-form-item v-show="isExpandForm" 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;">
@@ -142,6 +158,13 @@
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="wkshp_name"
            label="车间名称"
            width="130"
            show-tooltip-when-overflow
            sortable="custom"
          />
          <el-table-column
            prop="stepcode"
            label="工序编码"
@@ -279,6 +302,7 @@
} from '@/api/ReportManager'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
export default {
  name: 'Zzjg',
@@ -293,6 +317,7 @@
      mainHeight: 0,
      tableHeight: 0,
      form: {
        wkshopcode: '',
        wocode: '', // 工单编号
        partcode: '', // 产品编码
        partname: '', // 产品名称
@@ -312,6 +337,7 @@
        { code: 'S', name: '收料' }
      ],
      // groupArr: [],
      wkshopcodeArr: [],
      total: 10,
      tableData: [],
      dialogVisible: false,
@@ -359,10 +385,14 @@
  methods: {
    handleRequest() {
      this.getMaintenanceDetailsReportSearch().then(res => {
        // if (res.code === '200') {
        //   this.getMesOrderStepReportSelectUserGroup()
        // }
        if (res.code === '200') {
          this.getPrentOrganizationNoCompany()
        }
      })
    },
    async getPrentOrganizationNoCompany() {
      const { data: res } = await PrentOrganizationNoCompany()
      this.wkshopcodeArr = res
    },
    async getMaintenanceDetailsReportSearch() {
      let tempDate = this.form.repairdate
@@ -370,6 +400,7 @@
        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      }
      const data = {
        wkshopcode: this.form.wkshopcode,
        wocode: this.form.wocode,
        partcode: this.form.partcode,
        partname: this.form.partname,
@@ -416,6 +447,7 @@
      }
      const data = {
        wkshopcode: this.form.wkshopcode,
        wocode: this.form.wocode,
        partcode: this.form.partcode,
        partname: this.form.partname,
@@ -444,6 +476,7 @@
    },
    // 重置
    reset() {
      this.form.wkshopcode = ''
      this.form.wocode = ''
      this.form.partcode = ''
      this.form.partname = ''
src/views/statistic/subcontractingOperation.vue
@@ -14,6 +14,22 @@
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="车间名称" style=" display: flex;">
              <el-select
                v-model="form.wkshopcode"
                filterable
                :popper-append-to-body="false"
                style="width: 200px"
                placeholder="请选择"
              >
                <el-option
                  v-for="item in wkshopcodeArr"
                  :key="item.torg_code"
                  :label="item.torg_name"
                  :value="item.torg_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>
@@ -23,9 +39,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>
@@ -143,6 +159,13 @@
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="wkshp_name"
            label="车间名称"
            width="130"
            show-tooltip-when-overflow
            sortable="custom"
          />
          <el-table-column
            prop="stepcode"
            label="工序编码"
@@ -329,6 +352,7 @@
import { OutSourceReportExcelSearch, OutSourceReportSearch } from '@/api/ReportManager'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
export default {
  name: 'Zzjg',
@@ -343,6 +367,7 @@
      mainHeight: 0,
      tableHeight: 0,
      form: {
        wkshopcode: '',
        wocode: '', // 工单编号
        partcode: '', // 产品编码
        partname: '', // 产品名称
@@ -360,6 +385,7 @@
        { code: 'F', name: '发料' },
        { code: 'S', name: '收料' }
      ],
      wkshopcodeArr: [],
      total: 10,
      tableData: [],
      dialogVisible: false,
@@ -398,12 +424,17 @@
  },
  created() {
    this.getOutSourceReportSearch()
    this.getPrentOrganizationNoCompany()
  },
  mounted() {
    window.addEventListener('resize', this.getHeight)
    this.getHeight()
  },
  methods: {
    async getPrentOrganizationNoCompany() {
      const { data: res } = await PrentOrganizationNoCompany()
      this.wkshopcodeArr = res
    },
    async getOutSourceReportSearch() {
      let tempDate = this.form.receivdate
      if (tempDate.length > 0) {
@@ -411,6 +442,7 @@
      }
      const data = {
        wkshopcode: this.form.wkshopcode,
        wocode: this.form.wocode,
        partcode: this.form.partcode,
        partname: this.form.partname,
@@ -425,7 +457,7 @@
        rows: this.form.rows
      }
      console.log(data, 1)
      // console.log(data, 1)
      const res = await OutSourceReportSearch(data)
      this.tableData = res.data
      this.total = res.count
@@ -450,6 +482,7 @@
      }
      const data = {
        wkshopcode: this.form.wkshopcode,
        wocode: this.form.wocode,
        partcode: this.form.partcode,
        partname: this.form.partname,
@@ -477,6 +510,7 @@
    },
    // 重置
    reset() {
      this.form.wkshopcode = ''
      this.form.wocode = ''
      this.form.partcode = ''
      this.form.partname = ''
src/views/statistic/workOrderProcess.vue
@@ -15,6 +15,22 @@
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="车间名称" style=" display: flex;">
              <el-select
                v-model="form.wkshopcode"
                filterable
                :popper-append-to-body="false"
                style="width: 200px"
                placeholder="请选择"
              >
                <el-option
                  v-for="item in wkshopcodeArr"
                  :key="item.torg_code"
                  :label="item.torg_name"
                  :value="item.torg_code"
                />
              </el-select>
            </el-form-item>
            <el-form-item label="工单状态" style=" display: flex;">
              <el-select v-model="form.status" style="width: 200px" placeholder="请选择">
                <el-option
@@ -28,12 +44,10 @@
            <el-form-item label="工单编号" style=" display: flex;">
              <el-input v-model="form.wocode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <!--            <el-form-item label="车间编码" style=" display: flex;">-->
            <!--              <el-input v-model="form.wkshopcode" placeholder="请输入" style="width: 200px" />-->
            <!--            <el-form-item label="车间名称" style=" display: flex;">-->
            <!--              <el-input v-model="form.wkshopname" placeholder="请输入" style="width: 200px" />-->
            <!--            </el-form-item>-->
            <el-form-item label="车间名称" style=" display: flex;">
              <el-input v-model="form.wkshopname" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="产品编码" style=" display: flex;">
              <el-input v-model="form.partcode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
@@ -255,6 +269,7 @@
  ProductionScheduleReportExcelSearch,
  ProductionScheduleReportSearch
} from '@/api/ReportManager'
import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
export default {
  name: 'Zzjg',
@@ -287,6 +302,7 @@
        { label: '执行中', value: 'START' },
        { label: '已完成', value: 'CLOSED' }
      ],
      wkshopcodeArr: [],
      total: 10,
      tableData: []
@@ -296,12 +312,17 @@
  created() {
    this.getProductionScheduleReportSearch()
    this.getPrentOrganizationNoCompany()
  },
  mounted() {
    window.addEventListener('resize', this.getHeight)
    this.getHeight()
  },
  methods: {
    async getPrentOrganizationNoCompany() {
      const { data: res } = await PrentOrganizationNoCompany()
      this.wkshopcodeArr = res
    },
    async getProductionScheduleReportSearch() {
      let tempDate = this.form.lm_date
      if (tempDate.length > 0) {