From 4d4fc3b59f79a9ccdbde6ef0d8bfa75787eeedf2 Mon Sep 17 00:00:00 2001
From: "LAPTOP-R6EHHS26\\86155" <2217640373@qq.com>
Date: Thu, 4 Jan 2024 17:42:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87=E5=A4=87?=
 =?UTF-8?q?=E4=BB=B6=E7=94=B3=E9=A2=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/equipment/Repair/Sparepartlist.vue   | 3 +++
 src/pages/equipment/Repair/repairing.vue       | 6 +++---
 src/pages/equipment/Repair/repairingview.vue   | 6 +++---
 src/pages/quality/Materialinspection/index.vue | 7 ++++---
 src/pages/quality/index.vue                    | 2 +-
 src/utils/url.ts                               | 4 +++-
 6 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/pages/equipment/Repair/Sparepartlist.vue b/src/pages/equipment/Repair/Sparepartlist.vue
index 26f7622..a65e537 100644
--- a/src/pages/equipment/Repair/Sparepartlist.vue
+++ b/src/pages/equipment/Repair/Sparepartlist.vue
@@ -142,6 +142,7 @@ export default class ProductionQtyInsplist extends BasePage {
       console.log(bool);
       if (!bool) {
         this.rowdata.spareQuantity = this.number1;
+        this.rowdata.totalPrice = this.number1 * parseInt(this.rowdata.unitPrice);
         this.model.rowdata.push(this.rowdata);
         // uni.navigateTo({
         //   url: `/pages/equipment/Repair/repairing?listitem=` + encodeURIComponent(JSON.stringify(this.detailsinfo)),
@@ -164,6 +165,7 @@ export default class ProductionQtyInsplist extends BasePage {
               return;
             }
             item.spareQuantity = parseInt(item.spareQuantity) + parseInt(this.number1);
+            item.totalPrice = item.spareQuantity * parseInt(item.unitPrice);
             // console.log(this.detailsinfo)
             // uni.navigateTo({
             //   url: `/pages/equipment/Repair/repairing?listitem=` + encodeURIComponent(JSON.stringify(this.detailsinfo)),
@@ -181,6 +183,7 @@ export default class ProductionQtyInsplist extends BasePage {
       }
     } else {
       this.rowdata.spareQuantity = this.number1;
+      this.rowdata.totalPrice = this.number1 * parseInt(this.rowdata.unitPrice);
       this.model.rowdata.push(this.rowdata);
       // uni.navigateTo({
       //   url: `/pages/equipment/Repair/repairing?listitem=` + encodeURIComponent(JSON.stringify(this.detailsinfo)),
diff --git a/src/pages/equipment/Repair/repairing.vue b/src/pages/equipment/Repair/repairing.vue
index aed2553..fcd57f8 100644
--- a/src/pages/equipment/Repair/repairing.vue
+++ b/src/pages/equipment/Repair/repairing.vue
@@ -108,7 +108,7 @@
           <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
         <div class="details">
-          <div>备件费用: {{ item.equipmentCode }}</div>
+          <div>备件费用: {{ item.totalPrice }}</div>
           <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
         <!-- <div class="details">
@@ -154,10 +154,10 @@
           </u-form-item> -->
           <!-- 工单 -->
           <u-form-item label="原因分析:">
-            <jPicker sureColor="#ff0000" :moren="moren" @bindpicker="selectProductlocCode" showKey="label" valKey="value" :val="workReason.value" :options="model.locList" />
+            <jPicker sureColor="#ff0000" :moren="moren" @bindpicker="selectProductlocCode" showKey="label" valKey="value" :val="workReason.value" :options="model.locList2" />
           </u-form-item>
           <u-form-item label="维修措施:">
-            <jPicker sureColor="#ff0000" :moren="moren2" @bindpicker="selectProductlocCode2" showKey="label" valKey="value" :val="repairMeasures.value" :options="model.locList2" />
+            <jPicker sureColor="#ff0000" :moren="moren2" @bindpicker="selectProductlocCode2" showKey="label" valKey="value" :val="repairMeasures.value" :options="model.locList" />
           </u-form-item>
           <u-form-item label="上传图片:">
             <scroll-view class="scroll-view_H" scroll-x="true" :scroll-left="scrollLeft1()">
diff --git a/src/pages/equipment/Repair/repairingview.vue b/src/pages/equipment/Repair/repairingview.vue
index 20b6b5c..2d8d097 100644
--- a/src/pages/equipment/Repair/repairingview.vue
+++ b/src/pages/equipment/Repair/repairingview.vue
@@ -121,10 +121,10 @@
             <u-input :disabled="detailsinfolist.workCost == null ? true : true" v-model="detailsinfolist.workCost" placeholder="" />
           </u-form-item>
           <u-form-item label="原因分析:">
-            <jPicker :disabled="detailsinfolist.workReason == null ? true : true" sureColor="#ff0000" :moren="moren" showKey="label" valKey="value" :val="workReason.value" :options="model.locList" />
+            <jPicker :disabled="detailsinfolist.workReason == null ? true : true" sureColor="#ff0000" :moren="moren" showKey="label" valKey="value" :val="workReason.value" :options="model.locList2" />
           </u-form-item>
           <u-form-item label="维修措施:">
-            <jPicker :disabled="detailsinfolist.workReason == null ? true : true" sureColor="#ff0000" :moren="moren2" showKey="label" valKey="value" :val="repairMeasures.value" :options="model.locList2" />
+            <jPicker :disabled="detailsinfolist.repairMeasures == null ? true : true" sureColor="#ff0000" :moren="moren2" showKey="label" valKey="value" :val="repairMeasures.value" :options="model.locList" />
           </u-form-item>
           <!-- <u-form-item label="原因分析:">
             <u-input :disabled="detailsinfolist.workReason == null ? true : true" v-model="detailsinfolist.workReason" placeholder="" />
@@ -170,7 +170,7 @@
           <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
         <div class="details">
-          <div>备件费用: {{ item.equipmentCode }}</div>
+          <div>备件费用: {{ item.totalPrice }}</div>
           <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
         <!-- <div class="details">
diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue
index 1158b23..32e4753 100644
--- a/src/pages/quality/Materialinspection/index.vue
+++ b/src/pages/quality/Materialinspection/index.vue
@@ -61,7 +61,7 @@
             <div class="quest">检验项目 :</div>
             <div class="details">
               <div v-if="!isshow3">批次号 : {{ clickitem.incomeBatchNo }}</div>
-              <div style="display: flex; white-space: nowrap" v-if="isshow3">批次号 :<jPicker sureColor="#ff0000" :moren="moren2" @bindpicker="selectProductlocCode1" showKey="label" valKey="value" :val="incomeBatchNo.value" :options="model.locList" /></div>
+              <div style="display: flex; white-space: nowrap" v-if="isshow3">批次号 :<jPicker v-if="isshow3" sureColor="#ff0000" :moren="moren2" @bindpicker="selectProductlocCode1" showKey="label" valKey="value" :val="incomeBatchNo.value" :options="model.locList" /></div>
             </div>
             <div class="details">
               <div>订单号 : {{ clickitem.orderNo }}</div>
@@ -357,8 +357,9 @@ export default class PurchaseWHSRM extends BasePage {
       workorderCode: this.clickitem.orderNo,
     };
     await this.model.getBatchList(query1);
-    let labelname = this.selectList.label;
-    if (labelname == '过程检验') {
+    let labelname = this.selectList.value;
+    console.log(this.isshow3);
+    if (labelname == 'checkTypeSCXJ') {
       this.isshow3 = true;
       if (item.incomeBatchNo) {
         this.incomeBatchNo.value = item.incomeBatchNo;
diff --git a/src/pages/quality/index.vue b/src/pages/quality/index.vue
index 7de411d..d4c6522 100644
--- a/src/pages/quality/index.vue
+++ b/src/pages/quality/index.vue
@@ -14,7 +14,7 @@
         </view>
         <view class="content clearfix">
           <div class="menu1 fleft" :class="[index % 2 == 0 ? 'menu1active' : 'active1']" @click="link(item)" v-for="(item, index) in newmenuList3" :key="index">
-            <div class="item1">{{ item.attr1 }}</div>
+            <div class="item1">{{ item.checkName || item.attr1 }}</div>
             <div class="item2">{{ item.taskNum }}</div>
           </div>
         </view>
diff --git a/src/utils/url.ts b/src/utils/url.ts
index b4988cd..5b74e9d 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-//const qianzhuione = '/dev-api'; // '/prod-api'生产环境 // '/dev-api'开发环境是调后端本地时使用
+// const qianzhuione = '/dev-api'; // '/prod-api'生产环境 // '/dev-api'开发环境是调后端本地时使用
 const qianzhuione = '/prod-api';
 export const url = {
   wmspda: {
@@ -167,6 +167,8 @@ export const url = {
       getCheckTaskList: qianzhuione + '/quality/handCheck/getCheckTaskDetailList',
       // 获取待检验信息列表--点处理后获取检测项--提交
       commitCheckTaskList: qianzhuione + '/quality/handCheck/commitCheckResults',
+      // 根据工单获取批次下拉
+      getBatchList: qianzhuione + '/quality/handCheck/getBatchList',
     },
     // 历史记录
     Records: {