first-add

吴健

4 天以前 105d6b807d69eb95b3426f5cf6e87a8ff7b0611c

 billion-ui/src/views/main/om/info/index.vue

@@ -2,22 +2,22 @@
  <div class="app-container">
    <div>
      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
        <el-form-item label="工单编号" prop="workOrderNo">
          <el-input
            v-model="queryParams.workOrderNo"
            placeholder="请输入工单编号"
            clearable
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="订单编号" prop="salesOrderCode">
          <el-input
            v-model="queryParams.salesOrderCode"
            placeholder="请输入订单编号"
            clearable
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
<!--        <el-form-item label="工单编号" prop="workOrderNo">-->
<!--          <el-input-->
<!--            v-model="queryParams.workOrderNo"-->
<!--            placeholder="请输入工单编号"-->
<!--            clearable-->
<!--            @keyup.enter.native="handleQuery"-->
<!--          />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="订单编号" prop="salesOrderCode">-->
<!--          <el-input-->
<!--            v-model="queryParams.salesOrderCode"-->
<!--            placeholder="请输入订单编号"-->
<!--            clearable-->
<!--            @keyup.enter.native="handleQuery"-->
<!--          />-->
<!--        </el-form-item>-->
        <el-form-item label="产品编号" prop="productCode">
          <el-input
            v-model="queryParams.productCode"
@@ -26,16 +26,16 @@
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="工单状态" prop="orderStatus">
          <el-select v-model="queryParams.orderStatus" placeholder="请选择工单状态" clearable>
            <el-option
              v-for="dict in dict.type.order_status"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
            />
          </el-select>
        </el-form-item>
<!--        <el-form-item label="工单状态" prop="orderStatus">-->
<!--          <el-select v-model="queryParams.orderStatus" placeholder="请选择工单状态" clearable>-->
<!--            <el-option-->
<!--              v-for="dict in dict.type.order_status"-->
<!--              :key="dict.value"-->
<!--              :label="dict.label"-->
<!--              :value="dict.value"-->
<!--            />-->
<!--          </el-select>-->
<!--        </el-form-item>-->
        <el-form-item style="float: right; margin-right: 90px">
          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -88,25 +88,25 @@
            v-hasPermi="['main:info:export']"
          >导出</el-button>
        </el-col>
        <el-col :span="1.5">
          <el-button
            type="primary"
            plain
            icon="el-icon-receiving"
            size="mini"
            @click="handleReceive"
          >接收工单</el-button>
        </el-col>
        <el-col :span="1.5">
          <el-button
            type="primary"
            plain
            :disabled="multiple"
            icon="el-icon-magic-stick"
            size="mini"
            @click="handleCreate"
          >生成</el-button>
        </el-col>
<!--        <el-col :span="1.5">-->
<!--          <el-button-->
<!--            type="primary"-->
<!--            plain-->
<!--            icon="el-icon-receiving"-->
<!--            size="mini"-->
<!--            @click="handleReceive"-->
<!--          >接收工单</el-button>-->
<!--        </el-col>-->
<!--        <el-col :span="1.5">-->
<!--          <el-button-->
<!--            type="primary"-->
<!--            plain-->
<!--            :disabled="multiple"-->
<!--            icon="el-icon-magic-stick"-->
<!--            size="mini"-->
<!--            @click="handleCreate"-->
<!--          >生成</el-button>-->
<!--        </el-col>-->
        <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
      </el-row>
    </div>
@@ -114,32 +114,32 @@

    <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="工单编号" align="center" prop="workOrderNo" width="120">
        <template slot-scope="scope">
          <a style="color: #7099F9"  @click="orderDetail(scope.row.workOrderNo)" >{{scope.row.workOrderNo}}
          </a>
<!--          <div @click="orderDetail(scope.row.workOrderNo)">{{scope.row.workOrderNo}}</div>-->
        </template>
      </el-table-column>
      <el-table-column label="订单编号" align="center" prop="salesOrderCode" width="120"/>
<!--      <el-table-column label="工单编号" align="center" prop="workOrderNo" width="120">-->
<!--        <template slot-scope="scope">-->
<!--          <a style="color: #7099F9"  @click="orderDetail(scope.row.workOrderNo)" >{{scope.row.workOrderNo}}-->
<!--          </a>-->
<!--&lt;!&ndash;          <div @click="orderDetail(scope.row.workOrderNo)">{{scope.row.workOrderNo}}</div>&ndash;&gt;-->
<!--        </template>-->
<!--      </el-table-column>-->
<!--      <el-table-column label="订单编号" align="center" prop="salesOrderCode" width="120"/>-->
      <el-table-column label="产品编号" align="center" prop="productCode" width="180"/>
      <el-table-column label="产线编号" align="center" prop="lineCode" />
<!--      <el-table-column label="产线编号" align="center" prop="lineCode" />-->
      <el-table-column label="计划数量" align="center" prop="planQty" />
      <el-table-column label="计划开始时间" align="center" prop="planStartTime" width="120">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.planStartTime, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column>
      <el-table-column label="计划结束时间" align="center" prop="planEndTime" width="120">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.planEndTime, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column>
      <el-table-column label="工单状态" align="center" prop="orderStatus">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.order_status" :value="scope.row.orderStatus"/>
        </template>
      </el-table-column>
<!--      <el-table-column label="计划结束时间" align="center" prop="planEndTime" width="120">-->
<!--        <template slot-scope="scope">-->
<!--          <span>{{ parseTime(scope.row.planEndTime, '{y}-{m}-{d}') }}</span>-->
<!--        </template>-->
<!--      </el-table-column>-->
<!--      <el-table-column label="工单状态" align="center" prop="orderStatus">-->
<!--        <template slot-scope="scope">-->
<!--          <dict-tag :options="dict.type.order_status" :value="scope.row.orderStatus"/>-->
<!--        </template>-->
<!--      </el-table-column>-->
      <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -160,20 +160,29 @@
    <!-- 添加或修改生产工单对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
        <el-form-item label="工单编号" prop="workOrderNo">
          <el-input v-model="form.workOrderNo" placeholder="请输入工单编号" />
        </el-form-item>
        <el-form-item label="订单编号" prop="salesOrderCode">
          <el-input v-model="form.salesOrderCode" placeholder="请输入订单编号" />
        </el-form-item>
<!--        <el-form-item label="工单编号" prop="workOrderNo">-->
<!--          <el-input v-model="form.workOrderNo" placeholder="请输入工单编号" />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="订单编号" prop="salesOrderCode">-->
<!--          <el-input v-model="form.salesOrderCode" placeholder="请输入订单编号" />-->
<!--        </el-form-item>-->

        <el-form-item label="产品编号" prop="productCode">
          <el-input v-model="form.productCode" placeholder="请输入产品编号" />
          <el-select v-model="form.productCode" placeholder="请选择产品编号" clearable>
            <el-option
              v-for="dict in dict.type.product_type"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="产线编号" prop="lineCode">
          <el-input v-model="form.lineCode" placeholder="请输入产线编号" />
        </el-form-item>
<!--        <el-form-item label="产线编号" prop="lineCode">-->
<!--          <el-input v-model="form.lineCode" placeholder="请输入产线编号" />-->
<!--        </el-form-item>-->

        <el-form-item label="计划数量" prop="planQty">
          <el-input v-model="form.planQty" placeholder="请输入计划数量" />
          <el-input-number v-model="form.planQty" controls-position="right" :min="1" :max="10000"></el-input-number>
        </el-form-item>
        <el-form-item label="计划开始时间" prop="planStartTime">
          <el-date-picker clearable
@@ -183,23 +192,23 @@
            placeholder="请选择计划开始时间">
          </el-date-picker>
        </el-form-item>
        <el-form-item label="计划结束时间" prop="planEndTime">
          <el-date-picker clearable
            v-model="form.planEndTime"
            type="date"
            value-format="yyyy-MM-dd"
            placeholder="请选择计划结束时间">
          </el-date-picker>
        </el-form-item>
        <el-form-item label="工单状态" prop="orderStatus" v-if = updateFlag>
          <el-radio-group v-model="form.orderStatus">
            <el-radio
              v-for="dict in dict.type.order_status"
              :key="dict.value"
              :label="dict.value"
            >{{dict.label}}</el-radio>
          </el-radio-group>
        </el-form-item>
<!--        <el-form-item label="计划结束时间" prop="planEndTime">-->
<!--          <el-date-picker clearable-->
<!--            v-model="form.planEndTime"-->
<!--            type="date"-->
<!--            value-format="yyyy-MM-dd"-->
<!--            placeholder="请选择计划结束时间">-->
<!--          </el-date-picker>-->
<!--        </el-form-item>-->
<!--        <el-form-item label="工单状态" prop="orderStatus" v-if = updateFlag>-->
<!--          <el-radio-group v-model="form.orderStatus">-->
<!--            <el-radio-->
<!--              v-for="dict in dict.type.order_status"-->
<!--              :key="dict.value"-->
<!--              :label="dict.value"-->
<!--            >{{dict.label}}</el-radio>-->
<!--          </el-radio-group>-->
<!--        </el-form-item>-->
        <el-form-item label="备注" prop="remarks">
          <el-input
            type="textarea"
@@ -216,56 +225,56 @@
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>
    <el-dialog
      title="工单详情"
      :visible.sync="detailVisible"
      width="80%"
      center>
      <el-table v-loading="detailLoading" :data="schedulingList">
        <el-table-column label="工单编号" align="center" prop="workOrderNo" />
        <el-table-column label="总成序列号" width="180px" align="center" prop="sfcCode" />
        <el-table-column label="产品编码" align="center" prop="productCode" />
        <el-table-column label="上线时间" align="center" prop="onlineTime" width="180">
          <template slot-scope="scope">
            <span>{{ parseTime(scope.row.onlineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
          </template>
        </el-table-column>
        <el-table-column label="下线时间" align="center" prop="offlineTime" width="180">
          <template slot-scope="scope">
            <span>{{ parseTime(scope.row.offlineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
          </template>
        </el-table-column>
        <el-table-column label="质量状态" align="center" prop="qualityStatus">
          <template slot-scope="scope">
            <dict-tag :options="dict.type.product_status" :value="scope.row.qualityStatus"/>
          </template>
        </el-table-column>
        <el-table-column label="状态" align="center" prop="status">
          <template slot-scope="scope">
            <dict-tag :options="dict.type.status" :value="scope.row.status"/>
          </template>
        </el-table-column>
        <el-table-column label="更新用户" align="center" prop="updateBy" />
        <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
          <template slot-scope="scope">
            <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
          </template>
        </el-table-column>
        <el-table-column label="备注" width="180px" show-overflow-tooltip align="center" prop="remarks" />
      </el-table>
<!--    <el-dialog-->
<!--      title="工单详情"-->
<!--      :visible.sync="detailVisible"-->
<!--      width="80%"-->
<!--      center>-->
<!--      <el-table v-loading="detailLoading" :data="schedulingList">-->
<!--        <el-table-column label="工单编号" align="center" prop="workOrderNo" />-->
<!--        <el-table-column label="总成序列号" width="180px" align="center" prop="sfcCode" />-->
<!--        <el-table-column label="产品编码" align="center" prop="productCode" />-->
<!--        <el-table-column label="上线时间" align="center" prop="onlineTime" width="180">-->
<!--          <template slot-scope="scope">-->
<!--            <span>{{ parseTime(scope.row.onlineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
<!--          </template>-->
<!--        </el-table-column>-->
<!--        <el-table-column label="下线时间" align="center" prop="offlineTime" width="180">-->
<!--          <template slot-scope="scope">-->
<!--            <span>{{ parseTime(scope.row.offlineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
<!--          </template>-->
<!--        </el-table-column>-->
<!--        <el-table-column label="质量状态" align="center" prop="qualityStatus">-->
<!--          <template slot-scope="scope">-->
<!--            <dict-tag :options="dict.type.product_status" :value="scope.row.qualityStatus"/>-->
<!--          </template>-->
<!--        </el-table-column>-->
<!--        <el-table-column label="状态" align="center" prop="status">-->
<!--          <template slot-scope="scope">-->
<!--            <dict-tag :options="dict.type.status" :value="scope.row.status"/>-->
<!--          </template>-->
<!--        </el-table-column>-->
<!--        <el-table-column label="更新用户" align="center" prop="updateBy" />-->
<!--        <el-table-column label="更新时间" align="center" prop="updateTime" width="180">-->
<!--          <template slot-scope="scope">-->
<!--            <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
<!--          </template>-->
<!--        </el-table-column>-->
<!--        <el-table-column label="备注" width="180px" show-overflow-tooltip align="center" prop="remarks" />-->
<!--      </el-table>-->

      <pagination
        v-show="detailTotal>0"
        :total="detailTotal"
        :page.sync="queryDetailParams.pageNum"
        :limit.sync="queryDetailParams.pageSize"
        @pagination="getDetail"
      />
    <span slot="footer" class="dialog-footer">
<!--    <el-button @click="detailVisible = false">取 消</el-button>-->
<!--    <el-button type="primary" @click="detailVisible = false">确 定</el-button>-->
  </span>
    </el-dialog>
<!--      <pagination-->
<!--        v-show="detailTotal>0"-->
<!--        :total="detailTotal"-->
<!--        :page.sync="queryDetailParams.pageNum"-->
<!--        :limit.sync="queryDetailParams.pageSize"-->
<!--        @pagination="getDetail"-->
<!--      />-->
<!--    <span slot="footer" class="dialog-footer">-->
<!--&lt;!&ndash;    <el-button @click="detailVisible = false">取 消</el-button>&ndash;&gt;-->
<!--&lt;!&ndash;    <el-button type="primary" @click="detailVisible = false">确 定</el-button>&ndash;&gt;-->
<!--  </span>-->
<!--    </el-dialog>-->
  </div>

</template>
@@ -276,7 +285,7 @@

export default {
  name: "Info",
  dicts: ['order_status','product_status', 'status'],
  dicts: ['order_status','product_status', 'status', 'product_type'],
  data() {
    return {
      schedulingList: [],
@@ -321,27 +330,27 @@
      form: {},
      // 表单校验
      rules: {
        workOrderNo: [
          { required: true, message: "工单编号不能为空", trigger: "blur" }
        ],
        salesOrderCode: [
          { required: true, message: "订单编号不能为空", trigger: "blur" }
        ],
        // workOrderNo: [
        //   { required: true, message: "工单编号不能为空", trigger: "blur" }
        // ],
        // salesOrderCode: [
        //   { required: true, message: "订单编号不能为空", trigger: "blur" }
        // ],
        productCode: [
          { required: true, message: "产品编号不能为空", trigger: "blur" }
        ],
        lineCode: [
          { required: true, message: "产线编号不能为空", trigger: "blur" }
        ],
        // lineCode: [
        //   { required: true, message: "产线编号不能为空", trigger: "blur" }
        // ],
        planQty: [
          { required: true, message: "计划数量不能为空", trigger: "blur" }
        ],
        planStartTime: [
          { required: true, message: "计划开始时间不能为空", trigger: "blur" }
        ],
        planEndTime: [
          { required: true, message: "计划结束时间不能为空", trigger: "blur" }
        ],
        // planEndTime: [
        //   { required: true, message: "计划结束时间不能为空", trigger: "blur" }
        // ],
      }
    };
  },
@@ -449,6 +458,13 @@
    },
    /** 提交按钮 */
    submitForm() {
      if (this.form.planQty !== null && this.form.planQty !== ''){
        var p = /^\d+$/
        if (!p.test(this.form.planQty)){
          this.$modal.msgError("数量请输入正整数");
          return
        }
      }
      this.$refs["form"].validate(valid => {
        if (valid) {
          if (this.form.id != null) {