2023-12-11 设备和质量修改

src/views/modules/eam/eamFeedBack.vue

@@ -7,13 +7,13 @@
     </div>
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
       <el-form-item :label="'反馈单号'">
-        <el-input v-model="searchData.feedBackID" style="width: 120px"></el-input>
+        <el-input v-model="searchData.feedBackID" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'设备编码'">
-        <el-input v-model="searchData.objectID" style="width: 120px"></el-input>
+        <el-input v-model="searchData.objectID" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'故障原因'">
-        <el-input v-model="searchData.defectDesc" style="width: 120px"></el-input>
+        <el-input v-model="searchData.defectDesc" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'状态'">
         <el-select filterable v-model="searchData.status" style="width: 130px">

src/views/modules/eam/eamWorkOrderForCheck.vue

@@ -9,16 +9,16 @@
 
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
       <el-form-item :label="'计划编码'">
-        <el-input v-model="searchData.planID" style="width: 120px"></el-input>
+        <el-input v-model="searchData.planID" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'工单编码'">
-        <el-input v-model="searchData.orderNo" style="width: 120px"></el-input>
+        <el-input v-model="searchData.orderNo" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'设备编码'">
-        <el-input v-model="searchData.objectID" style="width: 120px"></el-input>
+        <el-input v-model="searchData.objectID" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'计划执行人员'">
-        <el-input v-model="searchData.planOperatorName" style="width: 120px"></el-input>
+        <el-input v-model="searchData.planOperatorName" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'状态'">
         <el-select filterable v-model="searchData.status" style="width: 130px">

src/views/modules/eam/eamWorkOrderForDefect.vue

@@ -8,20 +8,18 @@
 
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
       <el-form-item :label="'反馈单号'">
-        <el-input v-model="searchData.planID" style="width: 120px"></el-input>
+        <el-input v-model="searchData.planID" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'工单编码'">
-        <el-input v-model="searchData.orderNo" style="width: 120px"></el-input>
+        <el-input v-model="searchData.orderNo" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'设备编码'">
-        <el-input v-model="searchData.objectID" style="width: 120px"></el-input>
-      </el-form-item>
-      <el-form-item :label="'计划执行人员编码'">
-        <el-input v-model="searchData.planOperator" style="width: 120px"></el-input>
+        <el-input v-model="searchData.objectID" clearable style="width: 120px"></el-input>
       </el-form-item>
+<!--      <el-form-item :label="'计划执行人员编码'">-->
+<!--        <el-input v-model="searchData.planOperatorName" clearable style="width: 120px"></el-input>-->
+<!--      </el-form-item>-->
       <el-form-item :label="'人员部门'">
-<!--        <span slot="label" @click="getDepartmentList()"><a>设备部门</a></span>-->
-<!--        <el-input v-model="searchData.departmentName" clearable @clear="clearDepartmentName()" style="width: 120px"></el-input>-->
         <el-input v-model="searchData.departmentName" readonly style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'状态'">
@@ -71,7 +69,6 @@
           class="el-button el-button--primary el-button--medium">
           {{ "导出" }}
         </download-excel>
-<!--        <el-button  type="primary" @click="addModal()">新增</el-button>-->
       </el-form-item>
     </el-form>
 
@@ -391,6 +388,7 @@
           planID: '',
           objectID: '',
           planOperator: '',
+          planOperatorName: '',
           functionType: 'C',
           status: '',
           startDate:'',

src/views/modules/eam/eamWorkOrderForMaintenance.vue

@@ -9,16 +9,16 @@
 
     <el-form :inline="true"  label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
       <el-form-item :label="'计划编码'">
-        <el-input v-model="searchData.planID" style="width: 120px"></el-input>
+        <el-input v-model="searchData.planID" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'工单编码'">
-        <el-input v-model="searchData.orderNo" style="width: 120px"></el-input>
+        <el-input v-model="searchData.orderNo" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'设备编码'">
-        <el-input v-model="searchData.objectID" style="width: 120px"></el-input>
+        <el-input v-model="searchData.objectID" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'计划执行人员'">
-        <el-input v-model="searchData.planOperator" style="width: 120px"></el-input>
+        <el-input v-model="searchData.planOperator" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'状态'">
         <el-select v-model="searchData.status" style="width: 130px">

src/views/modules/eam/eamWorkPlanForCheck.vue

@@ -7,10 +7,10 @@
     </div>
     <el-form :inline="true" label-position="top" :model="searchData" >
       <el-form-item :label="'计划编码'">
-        <el-input v-model="searchData.planID" style="width: 120px"></el-input>
+        <el-input v-model="searchData.planID" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'计划描述'">
-        <el-input v-model="searchData.planDesc" style="width: 120px"></el-input>
+        <el-input v-model="searchData.planDesc" clearable style="width: 120px"></el-input>
       </el-form-item>
 <!--      <el-form-item :label="'设备编码'">-->
 <!--        <el-input v-model="searchData.objectID" style="width: 120px"></el-input>-->

src/views/modules/eam/eamWorkPlanForMaintenance.vue

@@ -9,15 +9,15 @@
 
     <el-form :inline="true" label-position="top" :model="searchData" >
       <el-form-item :label="'计划编码'">
-        <el-input v-model="searchData.planID" style="width: 120px"></el-input>
+        <el-input v-model="searchData.planID" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'计划描述'">
-        <el-input v-model="searchData.planDesc" style="width: 120px"></el-input>
+        <el-input v-model="searchData.planDesc" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'设备编码'">
-        <el-input v-model="searchData.objectID" style="width: 120px"></el-input>
+        <el-input v-model="searchData.objectID" clearable style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item :label="'计划开始日期：'">
+      <el-form-item :label="'计划开始日期'">
         <el-date-picker
           style="width: 120px"
           v-model="searchData.startDate"

src/views/modules/qc/IQCResultEntry.vue

@@ -1,17 +1,19 @@
 <template>
   <div class="mod-config">
+
     <!-- 收藏 -->
     <div>
       <span @click="favoriteFunction()">
         <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>
       </span>
     </div>
+
     <!-- 条件查询 -->
     <el-form :inline="true" label-position="top" :model="searchData" >
-      <el-form-item :label="'检验单号:'">
+      <el-form-item :label="'检验单号'">
         <el-input v-model="searchData.inspectionNo" clearable style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item :label="'状态:'">
+      <el-form-item :label="'状态'">
         <el-select v-model="searchData.state" style="width: 100px">
           <el-option label="全部" value=""></el-option>
           <el-option label="待检验" value="待检验"></el-option>
@@ -19,20 +21,29 @@
           <el-option label="已完成" value="已完成"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item :label="'检验结论:'">
+      <el-form-item :label="'检验结论'">
         <el-select v-model="searchData.inspectionResult" style="width: 100px">
           <el-option label="全部" value=""></el-option>
           <el-option label="合格" value="合格"></el-option>
           <el-option label="不合格" value="不合格"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item :label="'物料编码:'">
+      <el-form-item :label="'物料编码'">
         <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item :label="'物料名称:'">
+      <el-form-item :label="'物料名称'">
         <el-input v-model="searchData.partDesc" clearable style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item :label="'检验时间:'">
+      <el-form-item :label="'供应商'">
+        <el-input v-model="searchData.supplierDesc" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'处置措施'">
+        <el-input v-model="searchData.disposalMeasures" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'质检员'">
+        <el-input v-model="searchData.inspectorName" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'检验时间'">
         <el-date-picker style="width: 150px" v-model="searchData.startDate" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="开始日期"></el-date-picker>
         -
         <el-date-picker style="width: 150px" v-model="searchData.endDate" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="结束日期"></el-date-picker>
@@ -491,6 +502,10 @@
           partNo:'',
           partDesc:'',
           state: '',
+          inspectionResult: '',
+          supplierDesc: '',
+          disposalMeasures: '',
+          inspectorName: '',
           page: 1,
           limit: 10,
         },

src/views/modules/reportWorkOrder/reportCheckOrder.vue

@@ -9,21 +9,21 @@
 
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
       <el-form-item :label="'工单编码'">
-        <el-input v-model="searchData.orderNo" style="width: 120px"></el-input>
+        <el-input v-model="searchData.orderNo" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'计划编码'">
-        <el-input v-model="searchData.planID" style="width: 120px"></el-input>
+        <el-input v-model="searchData.planID" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'计划描述'">
-        <el-input v-model="searchData.planDesc" style="width: 120px"></el-input>
+        <el-input v-model="searchData.planDesc" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'设备编码'">
-        <el-input v-model="searchData.objectID" style="width: 120px"></el-input>
+        <el-input v-model="searchData.objectID" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'计划执行人员'">
-        <el-input v-model="searchData.planOperatorName" style="width: 120px"></el-input>
+        <el-input v-model="searchData.planOperatorName" clearable style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item :label="'计划执行日期：'">
+      <el-form-item :label="'计划执行日期'">
         <el-date-picker
           style="width: 120px"
           v-model="searchData.startDate"

src/views/modules/reportWorkOrder/reportDefectOrder.vue

@@ -8,9 +8,25 @@
     </div>
 
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
+      <el-form-item :label="'反馈单号'">
+        <el-input v-model="searchData.planID" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'工单编码'">
+        <el-input v-model="searchData.orderNo" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'设备编码'">
+        <el-input v-model="searchData.objectID" clearable style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item style="margin-left: 0px" >
-        <span slot="label" style="" @click="getBaseList(201)"><a herf="#">计划执行人员</a></span>
-        <el-input v-model="searchData.planOperator" style="width: 120px"></el-input>
+        <span slot="label" style="" @click="getBaseList(201)"><a herf="#">计划执行人员编码</a></span>
+        <el-input v-model="searchData.planOperator" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'状态'">
+        <el-select v-model="searchData.status" style="width: 100px">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="未开工" value="未开工"></el-option>
+          <el-option label="已到达" value="已到达"></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item :label="'计划执行日期：'">
         <el-date-picker

src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue

@@ -7,21 +7,21 @@
     </div>
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
       <el-form-item :label="'工单编码'">
-        <el-input v-model="searchData.orderNo" style="width: 120px"></el-input>
+        <el-input v-model="searchData.orderNo" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'计划编码'">
-        <el-input v-model="searchData.planID" style="width: 120px"></el-input>
+        <el-input v-model="searchData.planID" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'计划描述'">
-        <el-input v-model="searchData.planDesc" style="width: 120px"></el-input>
+        <el-input v-model="searchData.planDesc" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'设备编码'">
-        <el-input v-model="searchData.objectID" style="width: 120px"></el-input>
+        <el-input v-model="searchData.objectID" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'计划执行人员'">
-        <el-input v-model="searchData.planOperatorName" style="width: 120px"></el-input>
+        <el-input v-model="searchData.planOperatorName" clearable style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item :label="'计划执行日期：'">
+      <el-form-item :label="'计划执行日期'">
         <el-date-picker
           style="width: 120px"
           v-model="searchData.startDate"