380新产品,优化

yyt

2024-06-03 5030f3d30ccc1bd16db371c6970a48103aff9191

 jcdm-ui/src/views/main/bs/orderScheduling/index.vue

@@ -62,20 +62,33 @@
        </el-form-item>
        <br/>
        <el-form-item label="合箱报工" prop="report10">
          <el-input
          <el-select
            v-model="queryParams.report10"
            placeholder="请输入合箱报工"
            clearable
            @keyup.enter.native="handleQuery"
          />
            @keyup.enter.native="handleQuery">
            <el-option
              v-for="dict in dict.type.workreportingstatus"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="总装报工" prop="report20">
          <el-input
          <el-select
            v-model="queryParams.report20"
            placeholder="请输入总装报工"
            clearable
            @keyup.enter.native="handleQuery"
          />
            @keyup.enter.native="handleQuery">

            <el-option
              v-for="dict in dict.type.workreportingstatus"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="CVT报工" prop="report30">
          <el-input
@@ -195,84 +208,61 @@
            </template>
          </el-table-column>
          <el-table-column label="合箱报工" align="center" prop="report10">

            <template slot-scope="scope">
              <dict-tag :options="dict.type.workreportingstatus" :value="scope.row.report10"/>
            </template>
          </el-table-column>

          <el-table-column label="总装报工" align="center" prop="report20">

            <template slot-scope="scope">
              <dict-tag :options="dict.type.workreportingstatus" :value="scope.row.report20"/>
            </template>
          </el-table-column>

          <el-table-column label="CVT报工" align="center" prop="report30">

          </el-table-column>

          <el-table-column label="报工异常" align="center" prop="report30">
          </el-table-column>

          <el-table-column label="合箱上线时间" align="center" prop="boxClosingOnlineTime" width="160">
            <template slot-scope="scope">
              <span>{{ parseTime(scope.row.boxClosingOnlineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
            </template>
          </el-table-column>
          <el-table-column label="合箱下线时间" align="center" prop="closingBoxOfflineTime" width="160">
            <template slot-scope="scope">
              <span>{{ parseTime(scope.row.closingBoxOfflineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
            </template>
          </el-table-column>
          <el-table-column label="总装上线时间" align="center" prop="finalAssemblyLaunchTime" width="160">
            <template slot-scope="scope">
              <span>{{ parseTime(scope.row.finalAssemblyLaunchTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
            </template>
          </el-table-column>
          <el-table-column label="总装下线时间" align="center" prop="finalAssemblyOfflineTime" width="160">
            <template slot-scope="scope">
              <span>{{ parseTime(scope.row.finalAssemblyOfflineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
            </template>
          </el-table-column>
          <el-table-column label="CVT上线时间" align="center" prop="cvtLaunchTime" width="160">
            <template slot-scope="scope">
              <span>{{ parseTime(scope.row.cvtLaunchTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
            </template>
          </el-table-column>
          <el-table-column label="CVT下线时间" align="center" prop="cvtOfflineTime" width="160">
            <template slot-scope="scope">
              <span>{{ parseTime(scope.row.cvtOfflineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
            </template>
          </el-table-column>
<!--          <el-table-column label="合箱上线" align="center" prop="combinedBoxTime">-->

<!--          </el-table-column>-->
<!--          <el-table-column label="总装下线" align="center" prop="finalAssemblyTime">-->

<!--          </el-table-column>-->
          <el-table-column label="操作人" align="center" prop="operator">

          </el-table-column>
          <el-table-column label="操作时间" align="center" prop="operateTime" width="160">

          </el-table-column>
<!--          <el-table-column label="状态" align="center" prop="status">-->

<!--          </el-table-column>-->
<!--          <el-table-column label="预留字段1" align="center" prop="spareField1">-->

<!--          </el-table-column>-->
<!--          <el-table-column label="预留字段2" align="center" prop="spareField2">-->

<!--          </el-table-column>-->
<!--          <el-table-column label="预留字段3" align="center" prop="spareField3">-->

<!--          </el-table-column>-->
<!--          <el-table-column label="预留字段4" align="center" prop="spareField4">-->

<!--          </el-table-column>-->
<!--          <el-table-column label="创建用户" align="center" prop="createUser">-->

<!--          </el-table-column>-->
<!--          <el-table-column label="更改用户" align="center" prop="updateUser">-->

<!--          </el-table-column>-->
<!--          <el-table-column label="备注" align="center" prop="remarks">-->

<!--          </el-table-column>-->
<!--          <el-table-column fixed="right" width="200" label="操作" align="center" class-name="small-padding fixed-width">
            <template slot-scope="scope">
              <el-button
                size="mini"
                type="success"
                plain
                style="width: 72px"
                icon="el-icon-edit"
                @click="handleUpdate(scope.row)"
                v-hasPermi="['bs:orderScheduling:edit']"
              >修改</el-button>
              <el-button
                size="mini"
                type="danger"
                plain
                style="width: 72px"
                icon="el-icon-delete"
                @click="handleDelete(scope.row)"
                v-hasPermi="['bs:orderScheduling:remove']"
              >删除</el-button>
              <span>{{ parseTime(scope.row.operateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
            </template>
          </el-table-column>-->
          </el-table-column>

        </el-table>
    </el-card>

@@ -299,41 +289,20 @@
        </el-form-item>
        <el-form-item label="产品类型" prop="productType">
          <el-select v-model="form.productType" placeholder="请选择产品类型">
<!--            <el-option-->
<!--              v-for="dict in dict.type.${dictType}"-->
<!--              :key="dict.value"-->
<!--              :label="dict.label"-->
<!--              :value="dict.value"-->
<!--            ></el-option>-->

          </el-select>
        </el-form-item>
        <el-form-item label="机型" prop="model">
          <el-input v-model="form.model" placeholder="请输入机型" />
        </el-form-item>
<!--        <el-form-item label="生产状态" prop="productionStatus">-->
<!--          <el-radio-group v-model="form.productionStatus">-->
<!--&lt;!&ndash;            <el-radio&ndash;&gt;-->
<!--&lt;!&ndash;              v-for="dict in dict.type.${dictType}"&ndash;&gt;-->
<!--&lt;!&ndash;              :key="dict.value"&ndash;&gt;-->
<!--&lt;!&ndash;              :label="dict.value"&ndash;&gt;-->
<!--&lt;!&ndash;            >{{dict.label}}</el-radio>&ndash;&gt;-->
<!--          </el-radio-group>-->
<!--        </el-form-item>-->

        <el-form-item label="工时" prop="workingHours">
          <el-input v-model="form.workingHours" placeholder="请输入工时" />
        </el-form-item>
        <el-form-item label="当前工位" prop="currentWorkstation">
          <el-input v-model="form.currentWorkstation" placeholder="请输入当前工位" />
        </el-form-item>
<!--        <el-form-item label="质量状态" prop="qualityStatus">-->
<!--          <el-radio-group v-model="form.qualityStatus">-->
<!--            <el-radio-->
<!--              v-for="dict in dict.type.${dictType}"-->
<!--              :key="dict.value"-->
<!--              :label="dict.value"-->
<!--            >{{dict.label}}</el-radio>-->
<!--          </el-radio-group>-->
<!--        </el-form-item>-->

        <el-form-item label="是否打印" prop="whetherOrPrint">
          <el-input v-model="form.whetherOrPrint" placeholder="请输入是否打印" />
        </el-form-item>
@@ -359,27 +328,7 @@
<!--            >{{dict.label}}</el-radio>-->
          </el-radio-group>
        </el-form-item>
<!--        <el-form-item label="预留字段1" prop="spareField1">-->
<!--          <el-input v-model="form.spareField1" placeholder="请输入预留字段1" />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="预留字段2" prop="spareField2">-->
<!--          <el-input v-model="form.spareField2" placeholder="请输入预留字段2" />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="预留字段3" prop="spareField3">-->
<!--          <el-input v-model="form.spareField3" placeholder="请输入预留字段3" />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="预留字段4" prop="spareField4">-->
<!--          <el-input v-model="form.spareField4" placeholder="请输入预留字段4" />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="创建用户" prop="createUser">-->
<!--          <el-input v-model="form.createUser" placeholder="请输入创建用户" />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="更改用户" prop="updateUser">-->
<!--          <el-input v-model="form.updateUser" placeholder="请输入更改用户" />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="备注" prop="remarks">-->
<!--          <el-input v-model="form.remarks" placeholder="请输入备注" />-->
<!--        </el-form-item>-->

      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -394,7 +343,7 @@

export default {
  name: "OrderScheduling",
  dicts: ['order_scheduling_produce_status','quality_status','print_status','material_type'],
  dicts: ['order_scheduling_produce_status','quality_status','print_status','material_type','workreportingstatus'],
  data() {
    return {
      // 遮罩层