1.报工调整修改、打印模板修改

小小儁爺

2026-05-06 6082f939a0b869db7957473e2792501c1ff57a43

1.报工调整修改、打印模板修改

 src/views/produce/reportCorrect.vue

@@ -397,19 +397,57 @@
          />
        </el-form-item>
        <el-form-item v-if="dialogForm.flw_type==='Z'" label="报工班组" class="dialogFormItem">
          <div style="width: 200px;" class="ellipsis">
            {{ dialogForm.usergroup_name ? dialogForm.usergroup_name : '/' }}
          </div>
          <!--          <div style="width: 200px;" class="ellipsis">-->
          <!--            {{ dialogForm.usergroup_name ? dialogForm.usergroup_name : '/' }}-->
          <!--          </div>-->

          <el-select
            v-model="dialogForm.groupcode"
            style="width:200px"
            placeholder="请选择"
            filterable
            :disabled="dialogForm.groupcode===''"
            :popper-append-to-body="false"
            @change="usergroupChange"
          >
            <el-option
              v-for="item in usergroupArr"
              :key="item.usergroupcode"
              :label="item.usergroupname"
              :value="item.usergroupcode"
            />
          </el-select>

        </el-form-item>
        <el-form-item v-if="dialogForm.flw_type!=='Z'" label="供应商" class="dialogFormItem">
          <div style="width: 200px;" class="ellipsis">
            {{ dialogForm.wx_name }}
          </div>
        </el-form-item>
        <el-form-item label="报工人员" class="dialogFormItem">
          <div style="width: 200px;" class="ellipsis">
            {{ dialogForm.username }}
          </div>
        <el-form-item label="报工人员" class="dialogFormItem" prop="usercode">
          <!--          <div style="width: 200px;" class="ellipsis">-->
          <!--            {{ dialogForm.username }}-->
          <!--          </div>-->

          <el-select
            v-model="dialogForm.usercode"
            style="width:200px"
            placeholder="请选择"
            filterable
            multiple
            collapse-tags
            :multiple-limit="dialogForm.groupcode===''?1:0"
            :disabled="dialogForm.groupcode===''&&dialogForm.usergroupcode===''"
            :popper-append-to-body="false"
          >
            <el-option
              v-for="item in reportuserArr"
              :key="item.usercode"
              :label="item.usercode+' / '+item.username"
              :value="item.usercode"
            />
          </el-select>

        </el-form-item>
        <el-form-item :label="dialogForm.flw_type==='Z'?'合格数量':'收料数量'" prop="report_qty" class="dialogFormItem">
          <el-input
@@ -573,7 +611,13 @@
import { handleDatetime } from '@/utils/global'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import { DefectPermissions, PrentOrganizationNoCompany, StepData } from '@/api/GeneralBasicData'
import {
  DefectPermissions,
  GroupsPermissions, GroupsPersonPermissions,
  PersonPermissions,
  PrentOrganizationNoCompany,
  StepData
} from '@/api/GeneralBasicData'
import {
  MesOrderStepModelSearch, MesOrderStepPriceBatchUpdateSeave,
  MesOrderStepUpdateSeave,
@@ -647,11 +691,16 @@
      dialogFormRules: {
        report_qty: [
          { required: true, message: '请输入合格数量', trigger: ['blur', 'change'] }
        ],
        usercode: [
          { required: true, message: '请选择报工人员', trigger: ['blur', 'change'] }
        ]
      },
      stepCodeArr: [], // 下拉工序集合
      batchUpdateDialogVisible: false,
      stepPriceEdit: 0
      stepPriceEdit: 0,
      usergroupArr: [],
      reportuserArr: []

    }
  },
@@ -722,10 +771,20 @@
    batchUpdateHandleClose() {
      this.stepPriceEdit = 0
    },
    async   usergroupChange(val) {
      const { data: res } = await GroupsPersonPermissions({ groupcode: val })
      this.dialogForm.usercode = res[0].usercode_list ? res[0].usercode_list.split(',') : []
    },
    // 获取工序基础资料
    async getStepData() {
      const { data: res } = await StepData()
      this.stepCodeArr = res

      const { data: res1 } = await GroupsPermissions()// 班组
      this.usergroupArr = res1

      const { data: res2 } = await PersonPermissions() // 人员
      this.reportuserArr = res2
    },
    async getPrentOrganizationNoCompany() {
      const { data: res } = await PrentOrganizationNoCompany()
@@ -820,7 +879,7 @@
        this.dialogForm.last_choke = row.last_choke
        this.dialogForm.unprice = row.step_price
        this.dialogForm.groupcode = row.usergroup_code
        this.dialogForm.usercode = row.usercode
        this.dialogForm.usercode = row.usercode.split(',')
        this.dialogForm.usergroup_name = row.usergroup_name
        this.dialogForm.username = row.username
        this.dialogForm.report_date = row.report_date
@@ -886,7 +945,7 @@
            'last_choke': this.dialogForm.last_choke,
            'unprice': this.dialogForm.unprice,
            'groupcode': this.dialogForm.groupcode,
            'usercode': this.dialogForm.usercode,
            'usercode': this.dialogForm.usercode.join(','),
            wxcode: this.dialogForm.wx_code,
            'report_date': this.dialogForm.report_date,
            'report_qty': parseFloat(this.dialogForm.report_qty),

 src/views/produce/stepReport.vue

@@ -582,7 +582,7 @@
            <el-option
              v-for="item in reportuserArr"
              :key="item.usercode"
              :label="item.username"
              :label="item.usercode+' / '+item.username"
              :value="item.usercode"
            />
          </el-select>

 src/views/workOrder/workOrderList.vue

@@ -1553,6 +1553,22 @@
                  <el-form-item label="工单数量:" class="formContent">
                    {{ formApprove.plan_qty }}
                  </el-form-item>
                  <el-form-item label="打印人员:" class="formContent">
                    <!--                  {{ localStorage.getItem('username') }}-->
                    {{ formApprove.routename }}
                  </el-form-item>
                  <el-form-item label="打印时间:" class="formContent">
                    {{ formApprove.lm_date }}
                  </el-form-item>
                  <!--                  <br>-->
                  <!--                  <div style="width:98%;margin-left: 1%;border-bottom: 1px solid #000" />-->
                  <!--                  <br>-->
                  <!--                  <el-form-item label="子件备注:" class="formContent" style="width: 100%">-->
                  <!--                    {{ formApprove.memo }}-->
                  <!--                  </el-form-item>-->
                  <!--                  <el-form-item label="规格型号:" class="formContent" style="width: 100%">-->
                  <!--                    {{ formApprove.bomsubspec }}-->
                  <!--                  </el-form-item>-->

                  <!--                  <el-form-item label="客户名称:" class="formContent">-->
                  <!--                    {{ formApprove.priuserdefnvc1 }}-->
@@ -1576,13 +1592,7 @@
                  <!--                <el-form-item label="工艺路线:" class="formContent">-->
                  <!--                  {{ formApprove.routename }}-->
                  <!--                </el-form-item>-->
                  <el-form-item label="打印人员:" class="formContent">
                    <!--                  {{ localStorage.getItem('username') }}-->
                    {{ formApprove.routename }}
                  </el-form-item>
                  <el-form-item label="打印时间:" class="formContent">
                    {{ formApprove.lm_date }}
                  </el-form-item>

                </div>
              </el-form>
            </div>
@@ -1720,6 +1730,17 @@
                  <el-form-item label="打印时间:" class="formContent">
                    {{ formApprove.lm_date }}
                  </el-form-item>

                  <!--                  <br>-->
                  <!--                  <div style="width:98%;margin-left: 1%;border-bottom: 1px solid #000" />-->
                  <!--                  <br>-->
                  <!--                  <el-form-item label="子件备注:" class="formContent" style="width: 100%">-->
                  <!--                    {{ formApprove.memo }}-->
                  <!--                  </el-form-item>-->
                  <!--                  <el-form-item label="规格型号:" class="formContent" style="width: 100%">-->
                  <!--                    {{ formApprove.bomsubspec }}-->
                  <!--                  </el-form-item>-->

                </div>
              </el-form>
            </div>
@@ -4173,6 +4194,9 @@
      this.formApprove.priuserdefnvc5 = row.priuserdefnvc5 ? row.priuserdefnvc5 : '/'
      this.formApprove.priuserdefnvc6 = row.priuserdefnvc6 ? row.priuserdefnvc6 : '/'

      this.formApprove.memo = row.memo || '/'
      this.formApprove.bomsubspec = row.bomsubspec || '/'

      this.formApprove.TopInventoryName = row.TopInventoryName || '/'

      this.formApprove.saleOrderCode = this.formApprove.saleOrderCode !== '' ? this.formApprove.saleOrderCode : saleOrderCode