Merge branch 'dev_河南_鹤壁天沐玻璃厂' of http://114.132.189.42:9002/r/product-inven...

gongchunyi

8 天以前 f19238b6f581414fc1a414d3329440ac47fbb1e8

Merge branch 'dev_河南_鹤壁天沐玻璃厂' of http://114.132.189.42:9002/r/product-inventory-management into dev_河南_鹤壁天沐玻璃厂

 src/views/equipmentManagement/upkeep/Form/PlanModal.vue

@@ -7,7 +7,7 @@
    @cancel="handleCancel"
    @close="handleClose"
  >
    <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
    <el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
      <el-form-item label="设备名称">
        <el-select
          v-model="form.deviceLedgerId"
@@ -64,12 +64,12 @@
          placeholder="请输入保养部位"
        />
      </el-form-item>
      <el-form-item label="保养项目" prop="maintenanceItems">
      <el-form-item label="保养内容" prop="maintenanceItems">
        <el-input
          v-model="form.maintenanceItems"
          type="textarea"
          :rows="3"
          placeholder="请输入保养项目"
          placeholder="请输入保养内容"
        />
      </el-form-item>
      <el-form-item v-if="id" label="保修状态">
@@ -79,7 +79,7 @@
          <el-option label="失败" :value="2"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="计划保养日期">
      <el-form-item label="计划保养日期" prop="maintenancePlanTime">
        <el-date-picker
          style="width: 100%"
          v-model="form.maintenancePlanTime"
@@ -150,7 +150,8 @@
const rules = {
  maintenancePerson: [{ required: true, message: "请选择保养人", trigger: "change" }],
  maintenanceLocation: [{ required: true, message: "请输入保养部位", trigger: "blur" }],
  maintenanceItems: [{ required: true, message: "请输入保养项目", trigger: "blur" }],
  maintenanceItems: [{ required: true, message: "请输入保养内容", trigger: "blur" }],
  maintenancePlanTime: [{ required: true, message: "请选择计划保养日期", trigger: "change" }],
};

const syncCreateUserFromLogin = () => {

 src/views/equipmentManagement/upkeep/Form/UpkeepDetailModal.vue

@@ -14,7 +14,7 @@
          <el-descriptions-item label="保养部位" :span="2">
            <div class="multiline">{{ detail.maintenanceLocation || "—" }}</div>
          </el-descriptions-item>
          <el-descriptions-item label="保养项目" :span="2">
          <el-descriptions-item label="保养内容" :span="2">
            <div class="multiline">{{ detail.maintenanceItems || "—" }}</div>
          </el-descriptions-item>
          <el-descriptions-item label="保养人">{{ detail.maintenancePerson || "—" }}</el-descriptions-item>

 src/views/equipmentManagement/upkeep/Form/formDia.vue

@@ -158,12 +158,12 @@
            </el-row>
            <el-row>
                <el-col :span="24">
                    <el-form-item label="保养项目" prop="maintenanceItems">
                    <el-form-item label="保养内容" prop="maintenanceItems">
                        <el-input
                            v-model="form.maintenanceItems"
                            type="textarea"
                            :rows="3"
                            placeholder="请输入保养项目"
                            placeholder="请输入保养内容"
                        />
                    </el-form-item>
                </el-col>
@@ -217,7 +217,7 @@
        inspector: [{ required: true, message: "请选择录入人", trigger: "blur" },],
        maintenancePerson: [{ required: true, message: "请选择保养人", trigger: "change" }],
        maintenanceLocation: [{ required: true, message: "请输入保养部位", trigger: "blur" }],
        maintenanceItems: [{ required: true, message: "请输入保养项目", trigger: "blur" }],
        maintenanceItems: [{ required: true, message: "请输入保养内容", trigger: "blur" }],
        registrationDate: [{ required: true, message: "请选择登记时间", trigger: "change" }],
        frequencyDetail: [{
            validator: (rule, value, callback) => {

 src/views/equipmentManagement/upkeep/index.vue

@@ -376,7 +376,7 @@
    },
    {
        prop: "maintenanceItems",
        label: "保养项目",
        label: "保养内容",
        minWidth: 180,
        showOverflowTooltip: true,
    },
@@ -419,7 +419,7 @@
        showOverflowTooltip: true,
    },
    {
        label: "保养项目",
        label: "保养内容",
        align: "center",
        prop: "maintenanceItems",
        minWidth: 150,