1.提交

loulijun2021

2023-03-08 9fdaed10b31fd0c5d365cf90ee454cb0f90ac1be

1.提交

 src/views/bbgl/bzgz.vue

@@ -186,7 +186,7 @@
          </el-table-column>
          <el-table-column
            prop="usermoney"
            label="记件工资"
            label="计件工资"
            width="110"
            sortable="custom"
          >

 src/views/bbgl/rygz.vue

@@ -189,7 +189,7 @@
          </el-table-column>
          <el-table-column
            prop="usermoney"
            label="个人记件工资"
            label="个人计件工资"
            width="130"
            sortable="custom"
          >

 src/views/scgl/gd.vue

@@ -20,7 +20,7 @@
          style="display: flex;justify-content: space-between"
        >
          <div class="elForm">
            <el-form-item label-width="70px" label="订单状态" style=" display: flex;">
            <el-form-item label-width="70px" label="工单状态" style=" display: flex;">
              <el-select
                v-model="form.mesorderstus"
                :popper-append-to-body="false"
@@ -37,7 +37,7 @@
                />
              </el-select>
            </el-form-item>
            <el-form-item label="订单编号" style=" display: flex;">
            <el-form-item label="工单编号" style=" display: flex;">
              <el-input v-model="form.mesordercode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="源单单号" style="display: flex;">
@@ -158,7 +158,7 @@
          />
          <el-table-column
            prop="status"
            label="订单状态"
            label="工单状态"
            sortable="custom"
            width="110"
          >
@@ -449,7 +449,7 @@
        label-width="110px"
      >
        <el-form-item
          label="订单状态"
          label="工单状态"
          prop="mesorderstus"
        >
          <el-select
@@ -843,7 +843,7 @@
                size="mini"
              />
            </el-form-item>
            <el-form-item label="订单状态" style=" display: flex;">
            <el-form-item label="工单状态" style=" display: flex;">
              <el-select
                v-model="sourceForm.erporderstus"
                filterable
@@ -859,7 +859,7 @@
                />
              </el-select>
            </el-form-item>
            <el-form-item v-show="isExpandDialog" label="订单编号" style=" display: flex;">
            <el-form-item v-show="isExpandDialog" label="工单编号" style=" display: flex;">
              <el-input v-model="sourceForm.erpordercode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item v-show="isExpandDialog" label="产品编码" style=" display: flex;">
@@ -940,12 +940,12 @@
          />
          <el-table-column
            prop="status"
            label="订单状态"
            label="工单状态"
            sortable="custom"
            width="110"
          >
            <template slot-scope="{row}">
              <div v-if="row.status==='NEW'">新订单</div>
              <div v-if="row.status==='NEW'">新工单</div>
              <div v-if="row.status==='CREATING'">部分下达</div>
              <div v-if="row.status==='CREATED'">全部下达</div>
              <div v-if="row.status==='CLOSED'">已关闭</div>
@@ -953,7 +953,7 @@
          </el-table-column>
          <el-table-column
            prop="wo"
            label="订单编号"
            label="工单编号"
            sortable="custom"
            min-width="150"
          />
@@ -982,7 +982,7 @@
          </el-table-column>
          <el-table-column
            prop="qty"
            label="订单数量"
            label="工单数量"
            width="150"
            sortable="custom"
          />
@@ -1680,7 +1680,7 @@
      operation: '',
      dialogFormRules: {
        mesorderstus: [
          { required: true, message: '请选择订单状态', trigger: ['blur', 'change'] }
          { required: true, message: '请选择工单状态', trigger: ['blur', 'change'] }
        ],
        partcode: [
          { required: true, message: '请选择产品信息', trigger: ['blur', 'change'] }
@@ -1782,8 +1782,8 @@
      dialogVisibleSource: false,
      sourceTableData: [],
      sourceForm: {
        erporderstus: '', // 订单状态码
        erpordercode: '', // 订单编号
        erporderstus: '', // 工单状态码
        erpordercode: '', // 工单编号
        partcode: '', // 产品编码
        partname: '', // 产品名称
        partspec: '', // 产品规格
@@ -1880,7 +1880,7 @@
      const { data: res1 } = await PartSelect()
      this.partArr = res1
    },
    // 订单状态改变时
    // 工单状态改变时
    erporderstusChange(val) {
      this.form.mesorderstus = val
    },
@@ -2411,8 +2411,8 @@
      }

      const data = {
        erporderstus: this.sourceForm.erporderstus, // 订单状态码
        erpordercode: this.sourceForm.erpordercode, // 订单编号
        erporderstus: this.sourceForm.erporderstus, // 工单状态码
        erpordercode: this.sourceForm.erpordercode, // 工单编号
        partcode: this.sourceForm.partcode, // 产品编码
        partname: this.sourceForm.partname, // 产品名称
        partspec: this.sourceForm.partspec, // 产品规格

 src/views/scgl/sckbg.vue

@@ -1699,7 +1699,7 @@
        this.dialogForm.startqty = obj.noreportqty

        this.dialogForm.nextstepname = obj.nextstepname
        this.dialogForm.nextstepcode = obj.nextstepcode
        this.dialogForm.nextstepcode = obj.nextstepcode ? obj.nextstepcode : obj.stepcode

        this.dialogForm.startqtySum = obj.noreportqty
      })
@@ -1760,7 +1760,7 @@
        this.dialogForm.stepcode = obj.stepcode

        this.dialogForm.nextstepname = obj.nextstepname
        this.dialogForm.nextstepcode = obj.nextstepcode
        this.dialogForm.nextstepcode = obj.nextstepcode ? obj.nextstepcode : obj.stepcode

        this.dialogForm.noputqty = obj.noputqty
        this.dialogForm.stepseq = obj.seq

 src/views/zzmx/gxdy.vue

@@ -364,7 +364,7 @@
          :data="workDialogForm.workTreeArr"
          show-checkbox
          node-key="code"
          style="height: 280px;"
          style="height: 280px;overflow: auto"
          default-expand-all
          :props="workTreeDefaultProps"
          @check="checkBoxClick"
@@ -411,7 +411,7 @@
          :data="defectTree"
          show-checkbox
          node-key="code"
          style="height: 400px;"
          style="height: 400px;overflow: auto"
          default-expand-all
          :props="workTreeDefaultProps"
        />