1.递交

小小儁爺

2024-08-07 a00f2386cd0e504892abb4af6cfe2f5c8502105f

1.递交

 src/views/basicSettings/meterPrice.vue

@@ -297,7 +297,6 @@
                    />
                    <div style="margin-left: 5px">秒</div>
                  </div>

                </template>
              </el-table-column>
              <el-table-column
@@ -330,6 +329,19 @@
              >
                <template slot-scope="{row}">
                  <el-input v-model="row.unprice" oninput="value=value.replace(/[^0-9.]/g,'')" />
                </template>
              </el-table-column>
              <el-table-column
                prop="enable"
                label="是否启用"
                min-width="150"
              >
                <template slot-scope="{row}">
                  <el-switch
                    v-model="row.enable"
                    inactive-value="N"
                    active-value="Y"
                  />
                </template>
              </el-table-column>
            </el-table>
@@ -781,6 +793,7 @@
        row.stand_value = 0
      }
    },

    // 获取页面高度
    getHeight() {
      this.$nextTick(() => {
@@ -792,6 +805,7 @@
        this.$refs.tableDataRef.doLayout()
      })
    }

  }
}
</script>

 src/views/workOrder/workOrderList.vue

@@ -767,6 +767,91 @@
          :cell-style="this.$cellStyle"
          row-key="stepcode"
        >
          <el-table-column type="expand">
            <template slot-scope="props">

              <el-table
                :data="props.row.children"
                style="width: 96%;margin: auto;"
                border
                :row-class-name="tableRowClassName"
              >
                <el-table-column
                  prop="eqp_code"
                  label="设备/往来编码"
                  min-width="120"
                />
                <el-table-column
                  prop="eqp_name"
                  label="设备/往来名称"
                  min-width="120"
                />
                <el-table-column
                  prop="eqp_value"
                  label="设备节拍"
                  min-width="150"
                >
                  <template slot-scope="{row}">
                    <div style="display: flex;align-items: center">
                      <el-input
                        v-model="row.eqp_value"
                        placeholder="请输入"
                        oninput="value=value.replace(/[^0-9.]/g,'')"
                        @change="val=>eqpValueChange(val,row)"
                      />
                      <div style="margin-left: 5px">秒</div>
                    </div>
                  </template>
                </el-table-column>
                <el-table-column
                  prop="stand_value"
                  label="生产节拍"
                  min-width="120"
                >
                  <template slot-scope="{row}">
                    <div>{{ row.stand_value + ' ' + '秒/次' }}</div>
                  </template>
                </el-table-column>
                <el-table-column
                  prop="cavity_qty"
                  label="腔型数"
                  min-width="120"
                >
                  <template slot-scope="{row}">
                    <el-input
                      v-model="row.cavity_qty"
                      placeholder="请输入"
                      oninput="value=value.replace(/[^0-9.]/g,'')"
                      @change="val=>cavityQtyChange(val,row)"
                    />
                  </template>
                </el-table-column>
                <el-table-column
                  prop="unprice"
                  label="工序工价"
                  min-width="120"
                >
                  <template slot-scope="{row}">
                    <el-input v-model="row.unprice" oninput="value=value.replace(/[^0-9.]/g,'')" />
                  </template>
                </el-table-column>
                <el-table-column
                  prop="enable"
                  label="是否启用"
                  min-width="150"
                >
                  <template slot-scope="{row}">
                    <el-switch
                      v-model="row.enable"
                      inactive-value="N"
                      active-value="Y"
                    />
                  </template>
                </el-table-column>
              </el-table>
            </template>
          </el-table-column>

          <el-table-column
            type="index"
            label="序号"
@@ -793,7 +878,6 @@
                placeholder="请输入工序单价"
                oninput="value=value.replace(/[^0-9.]/g,'')"
                style="width: 100%"
                @click=""
              />
            </template>
          </el-table-column>
@@ -2882,7 +2966,7 @@
      this.dialogForm.mesmaxqty = res.canupdate_qty

      if (this.mesSetting.route) { // 按工艺路线走模式
        if (!this.dialogForm.routecode) {
        if (this.dialogForm.routecode) {
          await this.getPartcodeChangeDialog()
        }

@@ -3009,7 +3093,7 @@
        res.forEach(i => {
          this.stepTableData.push(
            {
              stepcode: i.step_code,
              stepcode: i.code,
              // stepname: i.stepname,
              stepprice: i.unprice
            }