1.递交

loulijun2021

2023-11-02 77aab033bca84f1f4ed186689644e4c72b57d7fc

 src/views/reportManager/personSalaryList.vue

@@ -50,13 +50,16 @@
                />
              </el-select>
            </el-form-item>
            <el-form-item label="销售单号" style=" display: flex;">
              <el-input v-model="form.saleordercode" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <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.partcode" placeholder="请输入" style="width: 200px" />
            </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.partname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <!--            <el-form-item label="规格型号" style=" display: flex;">-->
@@ -75,9 +78,9 @@
                />
              </el-select>
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="报工人员" style=" display: flex;">
              <el-input v-model="form.reportname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <!--            <el-form-item v-show="isExpandForm" label="报工人员" style=" display: flex;">-->
            <!--              <el-input v-model="form.reportname" style="width: 200px" placeholder="请输入" />-->
            <!--            </el-form-item>-->
            <el-form-item v-show="isExpandForm" label="报工时间" style="display: flex;align-items: center">
              <el-date-picker
                v-model="form.reportdate"
@@ -145,6 +148,12 @@
                width="50"
                fixed
                label="序号"
              />
              <el-table-column
                prop="saleOrderCode"
                label="销售单号"
                width="160"
                sortable="custom"
              />
              <el-table-column
                prop="wo_code"
@@ -315,6 +324,12 @@
                width="50"
                fixed
                label="序号"
              />
              <el-table-column
                prop="saleOrderCode"
                label="销售单号"
                width="160"
                sortable="custom"
              />
              <el-table-column
                prop="wo_code"
@@ -525,6 +540,7 @@
      tableHeight: 0,
      StepSelectArr: [], // 剔除工序数组
      form: {
        saleordercode: '',
        wocode: '', // 工单编号
        partcode: '', // 产品编码
        partname: '', // 产品名称
@@ -532,7 +548,8 @@
        stepname: '', // 工序名称
        groupcode: '', // 生产班组
        reportname: '', // 操作人员
        reportdate: '', // 操作时间
        reportdate: [new Date().getFullYear() + '-' + (new Date().getMonth() + 1).toString().padStart(
          2, '0') + '-01', new Date().toISOString().slice(0, 10)], // 操作时间
        wkshopcode: this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '', // 所属车间
        rejectstepcode: [], // 剔除工序(固定薪资工序不参与计算
        compute: 'last', // 计件方式
@@ -610,7 +627,7 @@
      this.WorkShopArr = res
    },
    // 获取工序下拉接口
    async  getStepSelect() {
    async getStepSelect() {
      const { data: res } = await StepSelect()
      this.StepSelectArr = res
    },
@@ -618,7 +635,7 @@
      const { columns, data } = param
      const sums = []

      const i = this.form.compute === 'last' ? 11 : 10
      const i = this.form.compute === 'last' ? 13 : 12

      columns.forEach((column, index) => {
        if (index === i) {
@@ -660,6 +677,7 @@
        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      }
      const data = {
        saleordercode: this.form.saleordercode,
        wocode: this.form.wocode,
        partcode: this.form.partcode,
        partname: this.form.partname,
@@ -718,6 +736,7 @@
      }

      const data = {
        saleordercode: this.form.saleordercode,
        wocode: this.form.wocode,
        partcode: this.form.partcode,
        partname: this.form.partname,
@@ -731,6 +750,7 @@
      }

      const { data: res } = await PeopleSalaryReportExcelSearch(data)
      // console.log(res, 1)
      window.location.href = res
    },
    // 查询
@@ -747,6 +767,7 @@
    },
    // 重置
    reset() {
      this.form.saleordercode = ''
      this.form.wocode = ''
      this.form.partcode = ''
      this.form.partname = ''
@@ -754,7 +775,8 @@
      this.form.stepname = ''
      this.form.groupcode = ''
      this.form.reportname = ''
      this.form.reportdate = ''
      this.form.reportdate = [new Date().getFullYear() + '-' + (new Date().getMonth() + 1).toString().padStart(
        2, '0') + '-01', new Date().toISOString().slice(0, 10)]
      this.form.wkshopcode = this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '' // 所属车间
      this.getPeopleSalaryReportSearch()
    },
@@ -763,7 +785,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()
      })