绑定小车码，预装总成码，手动工位扫码，拧紧逻辑优化

admin

6 天以前 768498719683f85e5ed19c73eb3d14cdbf420df4

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

@@ -10,24 +10,51 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="产品名称" prop="productName">
      <el-form-item label="产品编码" prop="productCode">
        <el-input
          v-model="queryParams.productName"
          placeholder="请输入产品名称"
          v-model="queryParams.productCode"
          placeholder="请输入产品编码"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="工单状态" prop="orderStatus">
        <el-select v-model="queryParams.orderStatus" placeholder="请选择工单状态" clearable>
      <el-form-item label-width="80" label="PACK码" prop="productNum">
        <el-input
          v-model="queryParams.productNum"
          placeholder="请输入PACK码"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="小车码" prop="trolleyYard">
        <el-input
          v-model="queryParams.trolleyYard"
          placeholder="请输入小车码"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label-width="1" label="上线报工状态" prop="onlineCompletionMark">
        <el-select v-model="queryParams.onlineCompletionMark" placeholder="请选择上线报工状态" clearable>
          <el-option
            v-for="dict in dict.type.order_state"
            v-for="dict in dict.type.work_reporting_status"
            :key="dict.value"
            :label="dict.label"
            :value="dict.value"
          />
        </el-select>
      </el-form-item>
      <el-form-item label-width="1" label="下线报工状态" prop="sfResult">
        <el-select v-model="queryParams.sfResult" placeholder="请选择下线报工状态" clearable>
          <el-option
            v-for="dict in dict.type.work_reporting_status"
            :key="dict.value"
            :label="dict.label"
            :value="dict.value"
          />
        </el-select>
      </el-form-item>

      <div style="display: none">
        <div id="printMe" style="width: 500px;">
          <div ref="canvasWrapper" id="canvasWrapper" style="display: flex;justify-content: center;"></div>
@@ -80,54 +107,54 @@

    <el-card style="margin-top: 10px" class="box-card">
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button
          type="primary"
          plain
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
          v-hasPermi="['om:productionOrde:add']"
        >新增</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="success"
          plain
          icon="el-icon-edit"
          size="mini"
          :disabled="single"
          @click="handleUpdate"
          v-hasPermi="['om:productionOrde:edit']"
        >修改</el-button>
      </el-col>
      <el-col :span="1.5">
<!--      <el-col :span="1.5">-->
<!--        <el-button-->
<!--          type="danger"-->
<!--          type="primary"-->
<!--          plain-->
<!--          icon="el-icon-delete"-->
<!--          icon="el-icon-plus"-->
<!--          size="mini"-->
<!--          :disabled="multiple"-->
<!--          @click="handleDelete"-->
<!--          v-hasPermi="['om:productionOrde:remove']"-->
<!--        >删除</el-button>-->
        <el-button
          type="info"
          icon="el-icon-upload2"
          size="mini"
          @click="handleImport"
        >导入</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
          v-hasPermi="['om:productionOrde:export']"
        >导出</el-button>
      </el-col>
<!--          @click="handleAdd"-->
<!--          v-hasPermi="['om:productionOrde:add']"-->
<!--        >新增</el-button>-->
<!--      </el-col>-->
<!--      <el-col :span="1.5">-->
<!--        <el-button-->
<!--          type="success"-->
<!--          plain-->
<!--          icon="el-icon-edit"-->
<!--          size="mini"-->
<!--          :disabled="single"-->
<!--          @click="handleUpdate"-->
<!--          v-hasPermi="['om:productionOrde:edit']"-->
<!--        >修改</el-button>-->
<!--      </el-col>-->
<!--      <el-col :span="1.5">-->
<!--&lt;!&ndash;        <el-button&ndash;&gt;-->
<!--&lt;!&ndash;          type="danger"&ndash;&gt;-->
<!--&lt;!&ndash;          plain&ndash;&gt;-->
<!--&lt;!&ndash;          icon="el-icon-delete"&ndash;&gt;-->
<!--&lt;!&ndash;          size="mini"&ndash;&gt;-->
<!--&lt;!&ndash;          :disabled="multiple"&ndash;&gt;-->
<!--&lt;!&ndash;          @click="handleDelete"&ndash;&gt;-->
<!--&lt;!&ndash;          v-hasPermi="['om:productionOrde:remove']"&ndash;&gt;-->
<!--&lt;!&ndash;        >删除</el-button>&ndash;&gt;-->
<!--        <el-button-->
<!--          type="info"-->
<!--          icon="el-icon-upload2"-->
<!--          size="mini"-->
<!--          @click="handleImport"-->
<!--        >导入</el-button>-->
<!--      </el-col>-->
<!--      <el-col :span="1.5">-->
<!--        <el-button-->
<!--          type="warning"-->
<!--          plain-->
<!--          icon="el-icon-download"-->
<!--          size="mini"-->
<!--          @click="handleExport"-->
<!--          v-hasPermi="['om:productionOrde:export']"-->
<!--        >导出</el-button>-->
<!--      </el-col>-->
      <el-col :span="1.5">
        <el-button
          type="warning"
@@ -147,6 +174,26 @@
          @click="patchwork"
        >补打</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="el-icon-download"
          size="mini"
          :disabled="onlineSingle"
          @click="onlineWorkReporting"
        >上线报工</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="el-icon-download"
          size="mini"
          :disabled="offlineSingle"
          @click="offlineWorkReporting"
        >下线报工</el-button>
      </el-col>
<!--      <el-col :span="1.5">-->
<!--        <el-button-->
<!--          type="warning"-->
@@ -162,12 +209,14 @@

      <el-table border v-loading="loading" :data="productionOrdeList" @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55" align="center" />
        <el-table-column label="生产工单号" width="160" align="center">
          <template slot-scope="scope">
            <router-link :to="{path: '/main/workReport-data/index/', query: {workOrderNo: scope.row.workOrderNo} }" class="link-type">
              <span>{{ scope.row.workOrderNo }}</span>
            </router-link>
          </template>
<!--        <el-table-column label="生产工单号" width="160" align="center">-->
<!--          <template slot-scope="scope">-->
<!--            <router-link :to="{path: '/main/workReport-data/index/', query: {workOrderNo: scope.row.workOrderNo} }" class="link-type">-->
<!--              <span>{{ scope.row.workOrderNo }}</span>-->
<!--            </router-link>-->
<!--          </template>-->
<!--        </el-table-column>-->
        <el-table-column label="生产工单号" width="160" align="center" prop="workOrderNo">
        </el-table-column>
<!--        <el-table-column label="订单编号" width="140" align="center" prop="salesOrderCode">-->
<!--        </el-table-column>-->
@@ -175,34 +224,41 @@
        </el-table-column>
        <el-table-column :show-overflow-tooltip='true' label="小车码" width="160" align="center" prop="trolleyYard">
        </el-table-column>
        <el-table-column label="产品编号" width="110" align="center" prop="productCode">
        <el-table-column label="产品型号" width="110" align="center" prop="productCode">
        </el-table-column>
        <el-table-column label="产品名称" width="120" align="center" prop="productName">
        </el-table-column>
        <el-table-column label="产品型号" align="center" prop="productModel">
        <el-table-column label="上线是否报工" align="center" width="120">
          <template slot-scope="scope">
           <dict-tag :options="dict.type.work_reporting_status" :value="scope.row.onlineCompletionMark"/>
          </template>
        </el-table-column>
<!--        <el-table-column label="工单状态" width="100" align="center" prop="orderStatus">-->
        <el-table-column label="实际开始时间" width="160" align="center" prop="actualStartTime">
        </el-table-column>
        <el-table-column label="下线是否报工" width="120" align="center">
          <template slot-scope="scope">
            <dict-tag :options="dict.type.work_reporting_status" :value="scope.row.sfResult"/>
          </template>
        </el-table-column>
<!--        <el-table-column width="240" fixed="right" label="操作" align="center" class-name="small-padding fixed-width">-->
<!--          <template slot-scope="scope">-->
<!--            <dict-tag :options="dict.type.order_state" :value="scope.row.orderStatus"/>-->
<!--            <el-button-->
<!--              size="mini"-->
<!--              type="success"-->
<!--              plain-->
<!--              style="width: 72px"-->
<!--              @click="onlineWorkReporting(scope.row)"-->
<!--              :disabled="isEditDisabled(scope.row.onlineCompletionMark)"-->
<!--            >上线报工</el-button>-->
<!--            <el-button-->
<!--              size="mini"-->
<!--              plain-->
<!--              style="width: 72px"-->
<!--              type="danger"-->
<!--              @click="offlineWorkReporting(scope.row)"-->
<!--              :disabled="isEditDisabled(scope.row.sfResult)"-->
<!--            >下线报工</el-button>-->
<!--          </template>-->
<!--        </el-table-column>-->
<!--        <el-table-column label="工厂编号" align="center" prop="siteCode">-->
<!--        </el-table-column>-->
        <el-table-column label="工站编号" align="center" prop="stationCode">
        </el-table-column>
<!--        <el-table-column label="报工信息结果" width="110" align="center" prop="resultText">-->
<!--        </el-table-column>-->
<!--        <el-table-column label="报工结果代码" width="110" align="center" prop="resultCode">-->
<!--        </el-table-column>-->
<!--        <el-table-column label="是否报工" width="80" align="center" prop="sfResult">-->
<!--        </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 label="创建人" width="80" align="center" prop="createUser">-->
<!--        </el-table-column>-->
<!--        <el-table-column label="备注" width="100" align="center" prop="remarks">-->
<!--        </el-table-column>-->
      </el-table>
    </el-card>
@@ -307,13 +363,13 @@
  delProductionOrde,
  addProductionOrde,
  updateProductionOrde,
  receivingWorkOrders, jieBang
  receivingWorkOrders, jieBang, workReportingByStation
} from "@/api/main/om/productionOrde/productionOrde";
import QRCode from "qrcodejs2";

export default {
  name: "ProductionOrde",
  dicts: ['order_state'],
  dicts: ['order_state','work_reporting_status'],
  components: {
    ItemSelect ,
  },
@@ -335,6 +391,8 @@
      ids: [],
      // 非单个禁用
      single: true,
      onlineSingle: true,
      offlineSingle: true,
      // 非多个禁用
      multiple: true,
      move: true,
@@ -416,6 +474,20 @@
    this.test1()
  },
  methods: {
    onlineWorkReporting(row){
      const id = row.id || this.ids
      const stationCode = "OP230"
      workReportingByStation(id,stationCode).then(response => {
        this.getList()
      });
    },
    offlineWorkReporting(row){
      const id = row.id || this.ids
      const stationCode = "OP500"
      workReportingByStation(id,stationCode).then(response => {
        this.getList()
      });
    },
    jieBang(row){
      const id = row.id || this.ids
      jieBang(id).then(response => {
@@ -644,6 +716,25 @@
      this.ids = selection.map(item => item.id)
      this.single = selection.length!==1
      this.multiple = !selection.length
      this.onlineSingle = selection.length!==1
      this.offlineSingle = selection.length!==1

      if(selection.length === 0){
        this.onlineSingle = true
        this.offlineSingle = true
      }
      if(selection.length === 1){
        if(selection[0].onlineCompletionMark === '2'){
          this.onlineSingle = false
        }else {
          this.onlineSingle = true
        }
        if(selection[0].sfResult === '2'){
          this.offlineSingle = false
        }else {
          this.offlineSingle = true
        }
      }
    },
    /** 新增按钮操作 */
    handleAdd() {