Merge branch 'master' of http://106.12.13.113:3000/lanju/lanju-front

src/views/device/deviceOrder/index.vue

@@ -46,10 +46,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="车间编码" prop="planWorkshop">
+      <el-form-item label="工作中心编码" prop="planWorkshop">
         <el-select
           v-model="queryParams.planWorkshop"
-          placeholder="请选择车间"
+          placeholder="请选择工作中心"
           clearable
         >
           <el-option
@@ -455,10 +455,10 @@
         align="center"
         prop="planType"
       />
-      <el-table-column label="车间编码" align="center" prop="planWorkshop" />
+      <el-table-column width="120" label="工作中心编码" align="center" prop="planWorkshop" />
       <el-table-column
         width="150"
-        label="车间"
+        label="工作中心名称"
         align="center"
         prop="workCenterName"
       />
@@ -673,7 +673,7 @@
               <el-descriptions-item label="工单编码">{{
                 this.form.orderCode
               }}</el-descriptions-item>
-              <el-descriptions-item label="车间编码">{{
+              <el-descriptions-item label="工作中心编码">{{
                 this.form.planWorkshop
               }}</el-descriptions-item>
               <el-descriptions-item label="工作中心">{{
@@ -771,7 +771,7 @@
     <el-dialog title="巡检详情" :visible.sync="workDetail" width="1000px">
       <el-tabs type="border-card">
         <el-tab-pane label="巡检信息">
-          <el-descriptions title="" border :column="2">
+          <el-descriptions title="" border :column="2" :contentStyle="WCS" :label-style="WLS">
             <el-descriptions-item label="计划编码">{{
               workVO.order.planCode
             }}</el-descriptions-item>
@@ -784,9 +784,9 @@
             <el-descriptions-item label="工单编码">{{
               workVO.order.orderCode
             }}</el-descriptions-item>
-            <el-descriptions-item label="车间编码">{{
+            <!-- <el-descriptions-item label="工作中心编码">{{
               workVO.order.planWorkshop
-            }}</el-descriptions-item>
+            }}</el-descriptions-item> -->
             <el-descriptions-item label="循环开始时间">{{
               workVO.order.planLoopStart
             }}</el-descriptions-item>
@@ -808,16 +808,13 @@
           </el-descriptions>
         </el-tab-pane>
         <el-tab-pane label="设备信息">
-          <el-descriptions class="my-margin-top" title="" :column="2" border>
+          <el-descriptions class="my-margin-top" title="" :column="2" border :contentStyle="WCS" :label-style="WLS">
             <el-descriptions-item label="设备编码">{{
               workVO.equ.equipmentCode
             }}</el-descriptions-item>
             <el-descriptions-item label="设备名称">{{
               workVO.equ.equipmentName
             }}</el-descriptions-item>
-            <el-descriptions-item label="设备位置">{{
-              workVO.equ.equipmentLocation
-            }}</el-descriptions-item>
             <el-descriptions-item label="设备类型编码">{{
               workVO.equ.equipmentTypeCode
             }}</el-descriptions-item>
@@ -830,6 +827,9 @@
             <el-descriptions-item label="所属工作中心名称">{{
               workVO.equ.workshopName
             }}</el-descriptions-item>
+            <el-descriptions-item label="设备位置">{{
+              workVO.equ.equipmentLocation
+            }}</el-descriptions-item>
           </el-descriptions>
         </el-tab-pane>
         <el-tab-pane label="检查项信息">
@@ -903,6 +903,12 @@ export default {
   dicts: ["device_order_status", "device_loop_type", "device_reach_standard"],
   data() {
     return {
+      WCS: {
+        "text-align": "left",
+      },
+      WLS: {
+        width: "225px",
+      },
       standardListVo: [],
       // 初始化VO
       workVO: {

src/views/device/faultReport/index.vue

@@ -200,6 +200,10 @@
         label="处理状态" 
         align="center"
         prop="orderStatus" />
+        <el-table-column 
+        label="报修来源" 
+        align="center" 
+        prop="orderSource" />
       <el-table-column
         label="报修去向"
         align="center"
@@ -229,10 +233,6 @@
           <span>{{ parseTime(scope.row.orderBreakdownTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column 
-        label="报修来源" 
-        align="center" 
-        prop="orderSource" />
       <el-table-column
         label="报修时间"
         align="center"
@@ -244,7 +244,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="报修人编号"
+        label="报修人工号"
         align="center"
         prop="orderRepairmanCode"
         width="150"
@@ -652,7 +652,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitCheckForm">确 定</el-button>
-        <el-button @click="cancelCheckForm">返 回</el-button>
+        <el-button @click="cancelOpenCheckForm">返 回</el-button>
       </div>
     </el-dialog>
 
@@ -882,7 +882,7 @@
         </el-tabs>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="cancelCheckForm">返 回</el-button>
+        <el-button @click="cancelViewCheckForm">返 回</el-button>
       </div>
     </el-dialog>
 
@@ -1413,15 +1413,17 @@ export default {
       this.openView = false;
     },
     // 审核返回按钮
-    cancelCheckForm() {
+    cancelViewCheckForm() {
       this.viewCheck = false;
     },
+    cancelOpenCheckForm() {
+      this.openCheck = false;
+    },
     // 表单重置
     reset() {
       this.form = {
         //报修图片
         fileList: null,
-        //
         orderId: null,
         orderCode: null,
         equipmentCode: null,

src/views/device/operation/index.vue

@@ -101,6 +101,7 @@
         />
       </el-form-item>
       <el-form-item label="维修人" prop="repairPerson">
+
         <el-input
           v-model="queryParams.repairPerson"
           placeholder="请输入维修人"
@@ -351,18 +352,31 @@
         align="left"
         prop="handlingMethod"
       />
-      <el-table-column
-        width="200"
-        label="更换备件"
-        align="left"
-        prop="replaceSpare"
-      />
       <el-table-column
         width="100"
         label="维修人"
         align="left"
         prop="repairPerson"
       />
+      <!-- <el-table-column
+        width="200"
+        label="更换备件"
+        align="left"
+        prop="replaceSpare"
+      /> -->
+      <el-table-column
+        label="更换备件"
+        align="center"
+        prop="replaceSpare"
+        width="150"
+      >
+        <template slot-scope="scope">
+          <el-button type="text" @click="handleViewSpareParts(scope.row)">
+            查看更换备件
+          </el-button>
+        </template>
+      </el-table-column>
+
       <el-table-column
         v-if="false"
         label="备用字段1"
@@ -519,6 +533,100 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+
+     <!-- 查看更换备件 -->
+     <el-dialog :title="title" :visible.sync="openSpareParts" width="1000px" append-to-body>
+      <el-table
+      v-loading="loading"
+      :data="sparePartsApplicationRecordList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- 序号 -->
+      <el-table-column
+        type="index"
+        width="90"
+        align="center"
+        :index="indexMethod"
+        label="序号"
+        fixed
+      />
+      <el-table-column
+        label="维修单号"
+        align="center"
+        prop="workCode"
+        width="250"
+      />
+      <el-table-column
+        label="使用设备"
+        align="center"
+        prop="spareUseEquipment"
+        width="150"
+      />
+      <el-table-column
+        label="备品备件编码"
+        align="center"
+        prop="spareCode"
+        width="120"
+      />
+      <el-table-column
+        label="备品备件名称"
+        align="center"
+        prop="spareName"
+        width="120"
+      />
+      <el-table-column
+        label="规格型号"
+        align="center"
+        prop="spareModel"
+        width="150"
+      />
+      <el-table-column label="数量" align="center" prop="spareQuantity" />
+      <el-table-column
+        label="领用时间"
+        align="center"
+        prop="applyTime"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.applyTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="申领人"
+        align="center"
+        prop="applyPeople"
+        width="80"
+      />
+      <el-table-column
+        label="单价"
+        align="center"
+        prop="unitPrice"
+        width="100"
+      />
+      <el-table-column
+        label="总价"
+        align="center"
+        prop="totalPrice"
+        width="100"
+      />
+      <el-table-column
+        label="批准人"
+        align="center"
+        prop="applyApprovePeople"
+        width="80"
+      />
+    </el-table>
+
+    <pagination
+      v-show="sparePartsTotal > 0"
+      :total="sparePartsTotal"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+    </el-dialog>
   </div>
 </template>
 
@@ -530,6 +638,10 @@ import {
   addOperation,
   updateOperation,
 } from "@/api/device/operation";
+
+import {
+  listRepairSparePartsRecord,
+} from "@/api/device/sparePartsApplicationRecord";
 import { parseTime } from "../../../utils/ruoyi";
 
 export default {
@@ -580,12 +692,16 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      //备件总条数
+      sparePartsTotal: 0,
       // 设备运行记录表格数据
       operationList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
+      //是否显示查看更换备件
+      openSpareParts: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -594,6 +710,7 @@ export default {
         groupLine: null,
         equipmentName: null,
         equipmentCode: null,
+        spareUseEquipment: null,
         faultTime: null,
         actualOperationTime: null,
         operationTime: null,
@@ -610,6 +727,12 @@ export default {
         attr3: null,
         createTimeArray: [],
       },
+      //查询更换备件参数
+      querySparePartsParams: {
+        pageNum: 1,
+        pageSize: 10,
+        equipmentCode: null,
+      },
       // 表单参数
       form: {},
       // 表单校验
@@ -625,11 +748,16 @@ export default {
   },
   methods: {
     parseTime,
+    // 生成表头序号
+    indexMethod(index) {
+      return index + 1;
+    },
     /** 查询设备运行记录列表 */
     getList() {
       this.loading = true;
       listOperation(this.queryParams).then((response) => {
         this.operationList = response.rows;
+        // this.operationList.failureDescription.replace(/;/g, '<br>')
         this.total = response.total;
         this.loading = false;
       });
@@ -703,6 +831,22 @@ export default {
         this.title = "修改设备运行记录";
       });
     },
+    /** 查看更换备件 */
+    handleViewSpareParts(row) {
+      this.querySparePartsParams.equipmentCode = row.equipmentCode;
+      this.querySparePartsParams.createTime = row.createTime;
+      listRepairSparePartsRecord(this.querySparePartsParams).then((response) => {
+        this.sparePartsApplicationRecordList = response.rows;
+        this.sparePartsTotal = response.total;
+        this.openSpareParts = true;
+        this.title = "查看更换备件";
+      });
+    },
+    /** 查看更换备件取消按钮 */
+    cancelSpareParts() {
+      this.openSpareParts = false;
+      this.reset();
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate((valid) => {

src/views/device/repairOrder/index.vue

@@ -1881,6 +1881,11 @@ export default {
             _data.minutes / 60 +
             _data.seconds / 3600
           ).toFixed(1) + "小时";
+
+        //如果不停机
+        if(this.form.workDownMachine == '0'){
+          this.form.faultDownTime = "0.0小时";
+        }
       }
 
       //增加故障停机时间
@@ -2310,6 +2315,7 @@ export default {
                   item.picturePath = this.listToString(item.picturePath);
                 }
               });
+
               writeRepairOrder(this.form).then((response) => {
                 this.openWrite = false;
                 this.$modal.msgSuccess("填写维修记录成功！");

src/views/device/repairOrder/selectSpareParts.vue

@@ -62,6 +62,7 @@
       <el-table-column
         label="使用设备"
         align="center"
+        width="120"
         prop="spareUseEquipment"
       />
       <el-table-column

src/views/device/sparePartsApplicationRecord/index.vue

@@ -179,7 +179,7 @@
         label="关联工单号"
         align="center"
         prop="workCode"
-        width="200"
+        width="250"
       />
       <el-table-column
         label="备品备件编码"
@@ -196,6 +196,7 @@
       <el-table-column
         label="使用设备"
         align="center"
+        width="150"
         prop="spareUseEquipment"
       />
       <el-table-column

src/views/device/sparePartsLedger/index.vue

@@ -128,7 +128,6 @@
     <el-table
       v-loading="loading"
       :data="sparePartsLedgerList"
-      border
     >
       <!-- 序号 -->
       <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"/>

src/views/device/spotInspectionWork/index.vue

@@ -33,8 +33,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="车间编码" prop="planWorkshop">
-        <el-select v-model="queryParams.planWorkshop" placeholder="请选择车间" clearable>
+      <el-form-item label="工作中心" prop="planWorkshop">
+        <el-select v-model="queryParams.planWorkshop" placeholder="请选择工作中心" clearable>
           <el-option
             v-for="work in workCenterList"
             :key="work.factoryCode"
@@ -338,8 +338,8 @@
           >
         </template>
       </el-table-column>
-      <el-table-column label="车间编码" align="center" prop="planWorkshop" />
-      <el-table-column width="150" label="车间" align="center" prop="workCenterName"/>
+      <el-table-column width="120" label="工作中心编码" align="center" prop="planWorkshop" />
+      <el-table-column width="150" label="工作中心名称" align="center" prop="workCenterName"/>
       <el-table-column width="100" label="设备编码" align="center" prop="equipmentCode" />
       <el-table-column width="200" label="设备名称" align="center" prop="equipmentName" />
       <el-table-column width="150" label="点检时间" align="center" prop="orderStart"/>

src/views/wms/equipment/index.vue

@@ -957,9 +957,15 @@
                   :value="form.equipmentCategory"
                 />
               </el-descriptions-item>
-              <el-descriptions-item label="工厂车间">{{
+              <el-descriptions-item label="工厂车间编码">{{
                 form.factoryWorkshop
               }}</el-descriptions-item>
+              <el-descriptions-item label="工厂车间">
+                <dict-tag
+                  :options="dict.type.factory_workshop"
+                  :value="form.factoryWorkshop"
+                />
+              </el-descriptions-item>
             </el-descriptions>
 
             <el-divider content-position="center">设备使用状况</el-divider>