备件申领-总价单价 故障描述 查看维修工单bug

src/views/device/repairOrder/index.vue

@@ -518,13 +518,21 @@
           </el-select>
         </el-form-item>
         <el-form-item label="故障描述" prop="workFaultDesc">
-          <el-input
+          <el-select
             v-model="form.workFaultDesc"
-            placeholder="请输入故障描述"
+            @change="$forceUpdate()"
+            clearable
+            filterable
             style="width: 280px"
-            type="textarea"
-            :autosize="{ minRows: 2, maxRows: 4 }"
-          />
+            @keyup.enter.native="handleQuery"
+          >
+            <el-option
+              v-for="item in workFaultDescOption"
+              :key="item.faultCode"
+              :label="item.faultSubclass"
+              :value="item.faultSubclass"
+            ></el-option>
+          </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -1061,7 +1069,11 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="维修用时" prop="workCostTime">
-                  <el-input v-model="form.workCostTime" style="width: 250px" disabled>
+                  <el-input
+                    v-model="form.workCostTime"
+                    style="width: 250px"
+                    disabled
+                  >
                   </el-input>
                 </el-form-item>
               </el-col>
@@ -1092,11 +1104,11 @@
                   <el-select
                     v-model="form.workReason"
                     placeholder="请选择故障原因"
-                     @change="$forceUpdate()"
-                      clearable
-                      filterable
-                      style="width: 250px"
-                      @keyup.enter.native="handleQuery"
+                    @change="$forceUpdate()"
+                    clearable
+                    filterable
+                    style="width: 250px"
+                    @keyup.enter.native="handleQuery"
                   >
                     <el-option
                       v-for="item in workReasonOption"
@@ -1112,11 +1124,11 @@
                   <el-select
                     v-model="form.repairMeasures"
                     placeholder="请选择处理措施"
-                     @change="$forceUpdate()"
-                      clearable
-                      filterable
-                      style="width: 250px"
-                      @keyup.enter.native="handleQuery"
+                    @change="$forceUpdate()"
+                    clearable
+                    filterable
+                    style="width: 250px"
+                    @keyup.enter.native="handleQuery"
                   >
                     <el-option
                       v-for="item in repairMeasuresOption"
@@ -1450,12 +1462,12 @@
                 <el-form-item label="故障原因" prop="workReason">
                   <el-select
                     v-model="form.workReason"
-                     @change="$forceUpdate()"
-                      disabled
-                      clearable
-                      filterable
-                      style="width: 250px"
-                      @keyup.enter.native="handleQuery"
+                    @change="$forceUpdate()"
+                    disabled
+                    clearable
+                    filterable
+                    style="width: 250px"
+                    @keyup.enter.native="handleQuery"
                   >
                     <el-option
                       v-for="item in workReasonOption"
@@ -1470,12 +1482,12 @@
                 <el-form-item label="处理措施" prop="repairMeasures">
                   <el-select
                     v-model="form.repairMeasures"
-                     @change="$forceUpdate()"
-                      clearable
-                      filterable
-                      disabled
-                      style="width: 250px"
-                      @keyup.enter.native="handleQuery"
+                    @change="$forceUpdate()"
+                    clearable
+                    filterable
+                    disabled
+                    style="width: 250px"
+                    @keyup.enter.native="handleQuery"
                   >
                     <el-option
                       v-for="item in repairMeasuresOption"
@@ -1520,6 +1532,7 @@ import {
 } from "@/api/device/repairOrder";
 import { listFaultReason } from "@/api/device/faultReason";
 import { listFaultMeasures } from "@/api/device/faultMeasures";
+import { listFaultDescription } from "@/api/device/faultDescription";
 import { getMaintenanceTeamList } from "@/api/device/equTeam";
 import ItemSelect from "./selectSingleEquipment.vue";
 import ItemSelectPerson from "./selectSinglePerson.vue";
@@ -1566,8 +1579,10 @@ export default {
         "text-align": "center",
         width: "250px",
       },
+      //故障描述
+      workFaultDescOption : [],
       //维修处理措施模糊选择
-      repairMeasuresOption : [],
+      repairMeasuresOption: [],
       //原因分析模糊选择
       workReasonOption: [],
       //检查项表格数据
@@ -1723,6 +1738,7 @@ export default {
     this.getEquFaultTypeTree();
     this.getWorkReason();
     this.getRepairMeasures();
+    this.getOrderDesc();
   },
   methods: {
     // 生成表头序号
@@ -1738,7 +1754,13 @@ export default {
         let { _data } = duration;
         console.log("打印维修时间", _data);
         //拼接
-        this.form.workCostTime = (_data.days*24 + _data.hours + (_data.minutes/60) + (_data.seconds/3600)).toFixed(1)+ "小时" ;
+        this.form.workCostTime =
+          (
+            _data.days * 24 +
+            _data.hours +
+            _data.minutes / 60 +
+            _data.seconds / 3600
+          ).toFixed(1) + "小时";
       }
     },
     //计算时间 结束维修时间-开始维修时间
@@ -1774,6 +1796,13 @@ export default {
         this.loading = false;
       });
     },
+    /** 查询故障描述列表 */
+    getOrderDesc() {
+      this.loading = true;
+      listFaultDescription(this.auxiliaryQueryParams).then((response) => {
+        this.workFaultDescOption = response.rows;
+      });
+    },
     /** 查询维修原因列表 */
     getWorkReason() {
       this.loading = true;
@@ -1829,8 +1858,7 @@ export default {
     },
     // 查看维修记录-取消按钮
     cancelQueryWriteForm() {
-      this.openWrite = false;
-      this.reset();
+      this.queryWrite = false;
     },
     // 表单重置
     reset() {

src/views/device/repairOrder/selectSpareParts.vue

@@ -99,6 +99,18 @@
         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"
@@ -326,6 +338,8 @@ export default {
         spareApplyList.workCode = this.queryParams.workCode;
         spareApplyList.storageId = item.storageId;
         spareApplyList.amount = item.amount;
+        spareApplyList.unitPrice = item.unitPrice;
+        spareApplyList.totalPrice = (item.spareQuantity)*(item.unitPrice);
         spareApplyLists.push(spareApplyList);
       });
       this.form.spareApplyLists = spareApplyLists;

src/views/device/repairOrder/selectSparePartsLedger.vue

@@ -104,6 +104,7 @@
             <span>{{ scope.row.amount - scope.row.storageAmount }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="单价" align="center" prop="unitPrice" />
         <el-table-column label="领用数量" align="center" prop="spareQuantity">
           <template slot-scope="scope">
             <el-input

src/views/device/sparePartsApplicationRecord/index.vue

@@ -205,6 +205,18 @@
         width="150"
       />
       <el-table-column label="领用数量" align="center" prop="spareQuantity" />
+      <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="spareGroupLine" /> -->
       <el-table-column
         label="领用时间"