Эх сурвалжийг харах

修复物资管理维修更换数据

pm 3 сар өмнө
parent
commit
ca009e8058

+ 1 - 1
src/views/mes/material/lockers/DetailsIndex.vue

@@ -5,7 +5,7 @@
       <el-radio-button label="second">领取记录</el-radio-button>
       <el-radio-button label="third">检查计划</el-radio-button>
       <el-radio-button label="fourth">检查记录</el-radio-button>
-      <el-radio-button label="fifth">更换记录</el-radio-button>
+      <el-radio-button label="fifth">维修/更换记录</el-radio-button>
     </el-radio-group>
     <!-- 物资清单 -->
     <div v-if="tabPosition == 'first'" class="materialsListcon">

+ 24 - 3
src/views/mes/material/replacementrecords/index.vue

@@ -26,7 +26,7 @@
       </el-form-item>
       <el-form-item label="物资类型" prop="materialsTypeId">
         <treeselect
-          style="width: 215px"
+          style="width: 210px"
           v-model="queryParams.materialsTypeId"
           :options="materialstypeOptions"
           :normalizer="materialnormalizer"
@@ -92,6 +92,16 @@
         >
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="操作类型" prop="operateType">
+        <el-select v-model="queryParams.operateType" placeholder="请选择操作类型">
+          <el-option
+            v-for="dict in dict.type.material_change_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button
           v-no-more-click
@@ -192,6 +202,16 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
+      <el-table-column
+        label="操作类型"
+        align="center"
+        prop="operateType"
+      >
+        <template slot-scope="scope">
+          <span v-if="scope.row.operateType==3">维修</span>
+          <span v-else>更换</span>
+        </template>
+      </el-table-column>
 <!--      <el-table-column-->
 <!--        label="操作"-->
 <!--        align="center"-->
@@ -376,7 +396,7 @@ export default {
     }
 
   },
-  dicts: ['material_status','checking_status'],
+  dicts: ['material_status','checking_status','material_change_type'],
   data() {
     return {
       //自动生成编码
@@ -415,7 +435,8 @@ export default {
         newMaterialsId:'',
         newMaterialsRfid:'',
         changeUserName:'',
-        recordId:''
+        recordId:'',
+        operateType:'',//操作类型
       },
       title:'',
       // 表单参数