设备台账字段增加查询条件增加

“linengliang”

2023-09-06 b2ec7b35247273c77768115635955991a449e942

 src/views/eam/modules/equipmentNew/EquipmentModal.vue

@@ -79,6 +79,8 @@
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="6">
            <a-form-model-item
              label="规格"
@@ -120,6 +122,8 @@
              ></j-image-upload>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-divider
            orientation="center"
            style="font-size: large;font-style: italic;color: #66aeed;"
@@ -179,6 +183,42 @@
          </a-col>
          <a-col :span="6">
            <a-form-model-item
              label="车间"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="factoryModelId"
            >
              <j-dict-select-tag
                allow-clear
                :disabled="formDisabled"
                placeholder="请选择资车间"
                :triggerChange="true"
                dictCode="mom_base_factory_model,name,id,del_flag!='1'"
                v-model="model.factoryModelId"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="6">
            <a-form-model-item
              label="产线"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="workCenterId"
            >
              <j-dict-select-tag
                allow-clear
                :disabled="formDisabled"
                placeholder="请选择产线"
                :triggerChange="true"
                dictCode="mom_base_work_center,name,id,del_flag!='1'"
                v-model="model.workCenterId"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item
              label="资产制造商"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
@@ -194,6 +234,8 @@
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-divider
            orientation="center"
            style="font-size: large;font-style: italic;color: #66aeed;"
@@ -249,6 +291,8 @@
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-divider
            orientation="center"
            style="font-size: large;font-style: italic;color: #66aeed;"
@@ -282,6 +326,7 @@
              />
            </a-form-model-item>
          </a-col>
       
          <a-col :span="6">
            <a-form-model-item
              label="验收日期"
@@ -311,6 +356,8 @@
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="6">
            <a-form-model-item
              label="工区"
@@ -339,6 +386,7 @@
              ></a-input>
            </a-form-model-item>
          </a-col>
      
          <a-col :span="6">
            <a-form-model-item
              label="重量计量单位"
@@ -367,6 +415,8 @@
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="6">
            <a-form-model-item
              label="功能位置"
@@ -395,6 +445,7 @@
              ></a-input>
            </a-form-model-item>
          </a-col>
      
          <a-col :span="6">
            <a-form-model-item
              label="资产来源国家"
@@ -479,6 +530,8 @@
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="6">
            <a-form-model-item
              label="系统"
@@ -540,6 +593,8 @@
            orientation="center"
            style="font-size: large;font-style: italic;color: #66aeed;"
          >ABC标识</a-divider>
        </a-row>
        <a-row>
          <a-col :span="6">
            <a-form-model-item
              label="平均使用率"
@@ -612,6 +667,8 @@
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="6">
            <a-form-model-item
              label="故障频率"
@@ -665,6 +722,8 @@
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-divider
            orientation="center"
            style="font-size: large;font-style: italic;color: #66aeed;"
@@ -701,7 +760,7 @@
                enter-button
                @search="onSearchPrecisionParametersTemplate()"
                :read-only="true"
                v-model="model.precisionParametersTemplateName"
                v-model="model.precisionParametersTemplateId_dictText"
              />
            </a-form-model-item>
          </a-col>
@@ -737,8 +796,34 @@
                enter-button
                @search="onSearchProcessParametersTemplate()"
                :read-only="true"
                v-model="model.processParametersTemplateName"
                v-model="model.processParametersTemplateId_dictText"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-divider
            orientation="center"
            style="font-size: large;font-style: italic;color: #66aeed;"
          >质保日期</a-divider>
          <a-col :span="6">
            <a-form-model-item
              label="质保开始日期"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="warrantyStart"
            >
            <j-date  :disabled="formDisabled" style="width: 100%;" placeholder="请选择开始日期" class="query-group-cust" v-model="model.warrantyStart"></j-date>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item
              label="质保结束日期"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="warrantyEnd"
            >
            <j-date  :disabled="formDisabled" style="width: 100%;" placeholder="请选择结束日期" class="query-group-cust" v-model="model.warrantyEnd"></j-date>
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -761,8 +846,8 @@
import { postAction, requestPut, getAction } from '@/api/manage'
import { duplicateCheck } from '@/api/api'
import moment from 'moment'
import ProcessParametersTemplateList from '../equipment/ProcessParametersTemplateList'
import PrecisionParametersTemplateList from '../equipment/PrecisionParametersTemplateList'
import ProcessParametersTemplateList from './serach/ProcessParametersTemplateList'
import PrecisionParametersTemplateList from './serach/PrecisionParametersTemplateList'
import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js'
import { JVXETypes } from '@/components/jeecg/JVxeTable'
export default {
@@ -822,6 +907,42 @@
        ],
        equipmentCategoryId: [
          { required: true, message: '请选则设备类别!' },
        ],
        specification:[
        { required: true, message: '请选则设备规格!' },
        ],
        model:[
        { required: true, message: '请选则设备型号!' },
        ],
        equipmentImportanceId:[
        { required: true, message: '请选则设备ABC标识!' },
        ],
        manageId:[
        { required: true, message: '请选择维护部门!' },
        ],
        useId:[
        { required: true, message: '请选择使用部门部门!' },
        ],
        specificEquipment:[
        { required: true, message: '请选择关键设备标识!' },
        ],
        equipmentStatus:[
        { required: true, message: '请选择设备状态!' },
        ],
        technologyStatus:[
        { required: true, message: '请选择设备状态!' },
        ],
        workCenterId:[
        { required: true, message: '请选择设备产线!' },
        ],
        factoryModelId:[
        { required: true, message: '请选择设备车间!' },
        ],
        warrantyStart:[
        { required: true, message: '请选择开始日期!' },
        ],
        warrantyEnd:[
        { required: true, message: '请选择结束日期!' },
        ]
      },
      url: {
@@ -986,7 +1107,7 @@
    sendProcessParametersTemplateRecord(data) {
      let record = data.record;
      this.model.processParametersTemplateId = record.id
      this.model.processParametersTemplateName = record.name
      this.model.processParametersTemplateId_dictText = record.name
      this.model = Object.assign({}, this.model);
    },

@@ -997,7 +1118,7 @@
    sendPrecisionParametersTemplateRecord(data) {
      let record = data.record;
      this.model.precisionParametersTemplateId = record.id
      this.model.precisionParametersTemplateName = record.name
      this.model.precisionParametersTemplateId_dictText= record.name
      this.model = Object.assign({}, this.model);
    },
    standardResultCompute() {