Merge remote-tracking branch 'origin/master'

懒羊羊

2024-03-15 7f6f725ad67e017c0bbae2a4de01952b88352af0

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

@@ -148,9 +148,13 @@
        </el-table-column>
        <el-table-column label="订单编号" width="140" align="center" prop="salesOrderCode">
        </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="产品序列号" width="110" align="center" prop="productNum">
        </el-table-column>
        <el-table-column label="产品型号" align="center" prop="productModel">
        </el-table-column>
        <el-table-column label="工单状态" width="100" align="center" prop="orderStatus">
          <template slot-scope="scope">
@@ -243,6 +247,9 @@
        <el-form-item label="产品名称" prop="productName">
          <el-input style="width: 265px" v-model="form.productName" disabled placeholder="请输入产品名称" />
        </el-form-item>
        <el-form-item label="产品型号" prop="productModel">
          <el-input v-model="form.productModel" placeholder="请输入产品型号" />
        </el-form-item>
        <el-form-item label="工厂编号" prop="siteCode">
          <el-input style="width: 265px" v-model="form.siteCode" placeholder="请输入工厂编号" />
        </el-form-item>
@@ -328,12 +335,14 @@
        frontEndId: 0,
        idNums: null,
        flag: null,
      siteCode: null,
      productNum: null,
      stationCode: null,
      resultText: null,
      resultCode: null,
      sfResult: null
        siteCode: null,
        productNum: null,
        stationCode: null,
        resultText: null,
        resultCode: null,
        sfResult: null,
        productModel: null

      },
      // 表单参数
      form: {},