修改订单排产时间

jiang

2024-01-30 c33ba17e4af3c5908e27c455374ea88073aa4895

修改订单排产时间

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

@@ -214,65 +214,14 @@
          <el-table-column label="CVT上线时间" align="center" prop="cvtLaunchTime" width="160">
          </el-table-column>
          <el-table-column label="CVT下线时间" align="center" prop="cvtOfflineTime" width="160">

          </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>
            </template>
          </el-table-column>-->
        </el-table>
    </el-card>

@@ -299,41 +248,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 +287,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>

 jcdm-ui/src/views/main/om/productionOrde/index.vue

@@ -92,26 +92,7 @@
          v-hasPermi="['om:productionOrde:export']"
        >导出</el-button>
      </el-col>
<!--      <el-col :span="1.5">-->
<!--        <el-button-->
<!--          type="warning"-->
<!--          plain-->
<!--          icon="el-icon-upload2"-->
<!--          :disabled="move"-->
<!--          size="mini"-->
<!--          @click="moveUp(val => val, 'up')"-->
<!--        >上移</el-button>-->
<!--      </el-col>-->
<!--      <el-col :span="1.5">-->
<!--        <el-button-->
<!--          type="warning"-->
<!--          plain-->
<!--          icon="el-icon-download"-->
<!--          size="mini"-->
<!--          :disabled="move"-->
<!--          @click="moveUp(val => val, 'down')"-->
<!--        >下移</el-button>-->
<!--      </el-col>-->

      <el-col :span="1.5">
        <el-button
          type="success"
@@ -150,85 +131,28 @@
        </el-table-column>
        <el-table-column label="机型" width="160" align="center" prop="typeZ">
        </el-table-column>

        <el-table-column label="需求数量" align="center" prop="planQty">
        </el-table-column>

        <el-table-column label="产品编号" width="150" align="center" prop="productCode">
        </el-table-column>
<!--        <el-table-column label="实际数量" width="160" align="center" prop="actualQty">-->
<!--        </el-table-column>-->

        <el-table-column label="工单状态" align="center" prop="orderStatus">
          <template slot-scope="scope">
            <dict-tag :options="dict.type.order_state" :value="scope.row.orderStatus"/>
          </template>
        </el-table-column>
<!--        <el-table-column label="工厂" align="center" prop="workshopCode">-->
<!--        </el-table-column>-->
<!--        <el-table-column label="仓库" align="center">-->
<!--        </el-table-column>-->

        <el-table-column label="产线" align="center" prop="lineCode">
        </el-table-column>
<!--        <el-table-column label="订单类型" align="center">-->
<!--        </el-table-column>-->
<!--        <el-table-column label="ZWS" align="center">-->
<!--        </el-table-column>-->

<!--        <el-table-column label="工艺流程" width="140" align="center" prop="routeCode">-->
<!--        </el-table-column>-->
<!--        <el-table-column label="产品BOM" width="140" align="center" prop="bomCode">-->
<!--        </el-table-column>-->
<!--        <el-table-column label="工艺配方" width="140" align="center" prop="recipeCode">-->
<!--        </el-table-column>-->

<!--        <el-table-column label="实际数量" align="center" prop="actualQty">-->
<!--        </el-table-column>-->
<!--        <el-table-column label="实际上线数量" width="100" align="center" prop="actualOnlineQty">-->
<!--        </el-table-column>-->
<!--        <el-table-column label="需求日期" align="center" prop="demandDate" width="180">-->
<!--        </el-table-column>-->
<!--        <el-table-column label="计划开始时间" width="160" align="center" prop="planStartTime">-->
<!--        </el-table-column>-->
<!--        <el-table-column label="计划结束时间" width="160" align="center" prop="planEndTime">-->
<!--        </el-table-column>-->
<!--        <el-table-column label="实际开始时间" width="160" align="center" prop="actualStartTime">-->
<!--        </el-table-column>-->
<!--        <el-table-column label="实际结束时间" width="160" align="center" prop="actualEndTime">-->
<!--        </el-table-column>-->

<!--        <el-table-column width="160" label="更新时间" align="center" prop="updateTime">-->
<!--        </el-table-column>-->
        <el-table-column label="通知单制单人" width="80" align="center" prop="createUser">
        </el-table-column>
        <el-table-column width="160" label="通知生成日期" align="center" prop="createTime">
        </el-table-column>
        <el-table-column label="成品描述" width="320" align="center" prop="productName">
        </el-table-column>
<!--        <el-table-column label="修改人" width="80" align="center" prop="updateUser">-->
<!--        </el-table-column>-->
<!--        <el-table-column label="备注" width="100" align="center" prop="remarks">-->
<!--        </el-table-column>-->
<!--        <el-table-column label="流水号" align="center" prop="streamNumber">-->
<!--        </el-table-column>-->
<!--        <el-table-column label="客户" width="80" align="center" prop="custom">-->
<!--        </el-table-column>-->
<!--        <el-table-column fixed="right" width="350" label="操作" align="center" class-name="small-padding fixed-width">-->
<!--          <template slot-scope="scope">-->
<!--            &lt;!&ndash;  工单状态（1创建、2已发布、3生产中、4已冻结、5已完工、6已关闭） &ndash;&gt;-->
<!--            <el-button type="success" :disabled="scope.row.orderStatus !== '1'"  style="width: 72px" plain @click="handleCommand('3',scope.row.id)" size="mini">-->
<!--              开始</el-button>-->
<!--            <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '2' && scope.row.orderStatus !== '3'" v-if="scope.row.orderStatus !== '2'&&  scope.row.orderStatus !== '4'" plain @click="handleCommand('4',scope.row.id)" type="warning" size="mini">-->
<!--              冻结</el-button>-->
<!--            <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '4'" v-if="scope.row.orderStatus === '4'" plain @click="handleCommand('3',scope.row.id)" type="warning" size="mini">-->
<!--              解冻</el-button>-->
<!--            <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '1'" plain @click="handleCommand('6',scope.row.id)" v-if="scope.row.orderStatus === '1'||scope.row.orderStatus === '3'||scope.row.orderStatus === '4'||scope.row.orderStatus === '5'" type="danger" size="mini">-->
<!--              关闭</el-button>-->
<!--            <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '6'" plain @click="handleCommand('1',scope.row.id)" v-if="scope.row.orderStatus === '6' " type="success" size="mini">-->
<!--              启用</el-button>-->
<!--            <el-button style="width: 72px" :disabled="scope.row.orderStatus === '4'||scope.row.orderStatus === '6'" v-if="scope.row.orderStatus !== '5'" @click="handleCommand('5',scope.row.id)" type="success" size="mini">-->
<!--              完成</el-button>-->
<!--            <el-button style="width: 72px" :disabled="scope.row.orderStatus === '5'" v-if="scope.row.orderStatus === '5'" type="success" size="mini">已完工</el-button>            <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '6'" plain @click="handleCommand('1',scope.row.id)" v-if="scope.row.orderStatus === '6' " type="success" size="mini">-->
<!--            启用</el-button>-->
<!--          </template>-->
<!--        </el-table-column>-->
      </el-table>
    </el-card>

@@ -398,7 +322,7 @@

export default {
  name: "ProductionOrde",
  dicts: ['order_state','year','month','day'],
  dicts: ['order_state','year','month','day','subscription_type', 'sys_yes_no', 'data_type','sys_normal_disable'],
  components: {
    ItemSelect ,
  },
@@ -740,6 +664,7 @@
      }

    },

    /** 新增按钮操作 */
    handleAdd() {
      this.initWorkshop();