src/views/eam/modules/equipmentNew/EquipmentModal.vue
@@ -33,7 +33,7 @@
                placeholder='请选择设备所属分类'
                :disabled='formDisabled'
                :triggerChange='true'
                :dictCode="caytegoryParam==='all'?'mom_eam_equipment_category,name,id':'mom_eam_equipment_category,name,id,equipment_category_uda1 = '+'\''+caytegoryParam+'\''"
                :dictCode="caytegoryParam==='all'?'mom_eam_equipment_category,name,id,del_flag!=\'1\'':'mom_eam_equipment_category,name,id,equipment_category_uda1 = '+'\''+caytegoryParam+'\''"
                v-model='model.equipmentCategoryId'
                @change='categoryChange'
              />
@@ -129,46 +129,6 @@
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span='6'>
            <a-form-model-item
              label='是否生产线'
              :labelCol='labelCol'
              :wrapperCol='wrapperCol'
              prop='isLine'
            >
              <!--                type='radio'-->
              <j-dict-select-tag
                allow-clear
                type='radio'
                placeholder='请选择'
                :triggerChange='true'
                dictCode='is_product'
                v-model='model.isLine'
                @change='isLineChange'
              />
            </a-form-model-item>
          </a-col>
          <a-col :span='6'  v-show='isLineEquipShow'>
            <a-form-model-item
              label='是否生产线主设备'
              :labelCol='labelCol'
              :wrapperCol='wrapperCol'
              prop='isLineEquip'
            >
              <!--              type='radio'-->
              <j-dict-select-tag
                allow-clear
                type='radio'
                placeholder='请选择'
                :triggerChange='true'
                dictCode='is_product'
                v-model='model.isLineEquip'
              />
            </a-form-model-item>
          </a-col>
          <a-col :span='6'>
            <a-form-model-item
              label='设备图片'
@@ -183,6 +143,49 @@
            </a-form-model-item>
          </a-col>
        </a-row>
<!--        <a-row>
          <a-col :span='6'>
            <a-form-model-item
              label='是否生产线'
              :labelCol='labelCol'
              :wrapperCol='wrapperCol'
              prop='isLine'
            >
              &lt;!&ndash;                type='radio'&ndash;&gt;
              <j-dict-select-tag
                allow-clear
                type='radio'
                placeholder='请选择'
                :triggerChange='true'
                dictCode='is_product'
                v-model='model.isLine'
                @change='isLineChange'
              />
            </a-form-model-item>
          </a-col>
          <a-col
            :span='6'
            v-show='isLineEquipShow'
          >
            <a-form-model-item
              label='是否生产线主设备'
              :labelCol='labelCol'
              :wrapperCol='wrapperCol'
              prop='isLineEquip'
            >
              &lt;!&ndash;              type='radio'&ndash;&gt;
              <j-dict-select-tag
                allow-clear
                type='radio'
                placeholder='请选择'
                :triggerChange='true'
                dictCode='is_product'
                v-model='model.isLineEquip'
              />
            </a-form-model-item>
          </a-col>
        </a-row>-->
        <a-row>
          <!-- 中心 -->
          <a-col :span='6'>
@@ -392,7 +395,7 @@
        <a-row>
          <a-col :span='6'>
            <a-form-model-item
              label='操作系统'
              label='是否有操作系统'
              :labelCol='labelCol'
              :wrapperCol='wrapperCol'
              prop='operatingSystem'
@@ -412,7 +415,7 @@
            v-if="model.operatingSystem=='yes'"
          >
            <a-form-model-item
              label='系统'
              label='系统信息'
              :labelCol='labelCol'
              :wrapperCol='wrapperCol'
              prop='system'
@@ -485,19 +488,21 @@
                style='width: 100%;'
                v-model='model.acceptanceCheckDate'
                @change='dateChange'
                valueFormat="YYYY-MM-DD"
                format="YYYY-MM-DD"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span='6'>
            <a-form-model-item
              label='技术状态检定周期'
              label='技术状态鉴定周期'
              :labelCol='labelCol'
              :wrapperCol='wrapperCol'
              prop='checkPeriod'
            >
              <j-dict-select-tag
                allow-clear
                placeholder='请选择技术状态检定周期 '
                placeholder='请选择技术状态鉴定周期 '
                :triggerChange='true'
                dictCode='check_period'
                v-model='model.checkPeriod'
@@ -518,6 +523,56 @@
                placeholder='请选择日期'
                class='query-group-cust'
                v-model='model.nextTechnologyStatusQualificationTime'
              ></j-date>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span='6'>
            <a-form-model-item
              label='二保日期'
              :labelCol='labelCol'
              :wrapperCol='wrapperCol'
              prop='secondMaintenanceTime'
            >
              <j-date
                :disabled='true'
                style='width: 100%;'
                placeholder='请选择二保日期'
                class='query-group-cust'
                v-model='model.secondMaintenanceTime'
              ></j-date>
            </a-form-model-item>
          </a-col>
          <a-col :span='6'>
            <a-form-model-item
              label='三保日期'
              :labelCol='labelCol'
              :wrapperCol='wrapperCol'
              prop='thirdMaintenanceTime'
            >
              <j-date
                :disabled='true'
                style='width: 100%;'
                placeholder='请选择三保日期'
                class='query-group-cust'
                v-model='model.thirdMaintenanceTime'
              ></j-date>
            </a-form-model-item>
          </a-col>
          <a-col :span='6'>
            <a-form-model-item
              label='下次三保日期'
              :labelCol='labelCol'
              :wrapperCol='wrapperCol'
              prop='nextThirdMaintenanceTime'
            >
              <j-date
                :disabled='true'
                style='width: 100%;'
                placeholder='请选择下次三保日期'
                class='query-group-cust'
                v-model='model.nextThirdMaintenanceTime'
              ></j-date>
            </a-form-model-item>
          </a-col>
@@ -1028,7 +1083,7 @@
        num: [
          { required: true, message: '请输入设备编号!' },
          // { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' },
          { validator: this.validateNum }
          // { validator: this.validateNum }
        ],
        name: [
          { required: true, message: '请输入设备名称!' }
@@ -1075,7 +1130,7 @@
          { required: true, message: '请选择设备状态!' }
        ],
        workCenterId: [
          { required: false, message: '请选择中心!' }
          { required: true, message: '请选择中心!' }
        ],
        factoryModelId: [
          { required: false, message: '请选择工区!' }
@@ -1156,12 +1211,13 @@
            if (res.success) {
              that.$message.success(res.message)
              that.$emit('ok')
              that.close()
            } else {
              that.$message.warning(res.message)
              that.$message.error(res.message)
            }
          }).finally(() => {
            that.confirmLoading = false
            that.close()
            // that.close()
          })
        } else {
          return false