Merge remote-tracking branch 'origin/master'

cuilei

5 天以前 ba77fdc6a30c9ad0941e40319f8c4f6fe6fdf9f1

 src/views/mes/modules/MesProductionWorkOrderForm.vue

@@ -4,11 +4,6 @@
      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
        <a-row>
          <a-col :span="12">
            <a-form-model-item label="删除标记" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
              <a-input-number v-model="model.delFlag" placeholder="请输入删除标记" style="width: 100%" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="工单号(任务号)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workOrderCode">
              <a-input v-model="model.workOrderCode" placeholder="请输入工单号(任务号)"  ></a-input>
            </a-form-model-item>
@@ -29,28 +24,28 @@
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="产线ID(冗余)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="factoryId">
              <a-input v-model="model.factoryId" placeholder="请输入产线ID(冗余)"  ></a-input>
            <a-form-model-item label="产线" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="factoryId">
              <a-input v-model="model.factoryId_dictText" placeholder="请输入产线ID(冗余)"  ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="班组ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="groupId">
              <a-input v-model="model.groupId" placeholder="请输入班组ID"  ></a-input>
            <a-form-model-item label="班组" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="groupId">
              <a-input v-model="model.groupId_dictText" placeholder="请输入班组ID"  ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="班次ID(冗余)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shiftId">
              <a-input v-model="model.shiftId" placeholder="请输入班次ID(冗余)"  ></a-input>
            <a-form-model-item label="班次" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shiftId">
              <a-input v-model="model.shiftId_dictText" placeholder="请输入班次ID(冗余)"  ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="排产日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workOrderDate">
              <j-date placeholder="请选择排产日期"  v-model="model.workOrderDate" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
              <j-date placeholder="请选择排产日期"  v-model="model.workOrderDate" :show-time="true" date-format="YYYY-MM-DD" style="width: 100%" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="工单状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workOrderStatus">
              <j-dict-select-tag type="list" v-model="model.workOrderStatus" dictCode="work_order_status" placeholder="请选择工单状态" />
              <j-dict-select-tag type="list" v-model="model.workOrderStatus_dictText" dictCode="work_order_status" placeholder="请选择工单状态" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
@@ -107,7 +102,7 @@
         },
        labelCol: {
          xs: { span: 24 },
          sm: { span: 5 },
          sm: { span: 6 },
        },
        wrapperCol: {
          xs: { span: 24 },
@@ -166,7 +161,7 @@
              that.confirmLoading = false;
            })
          }
         

        })
      },
    }