修改设备备件申领

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)),

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()">

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">

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;
+    let labelname = this.selectList.value;
-    if (labelname == '过程检验') {
+    console.log(this.isshow3);
+    if (labelname == 'checkTypeSCXJ') {
       this.isshow3 = true;
       if (item.incomeBatchNo) {
         this.incomeBatchNo.value = item.incomeBatchNo;

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>

src/utils/url.ts

@@ -167,6 +167,8 @@ export const url = {
       getCheckTaskList: qianzhuione + '/quality/handCheck/getCheckTaskDetailList',
       // 获取待检验信息列表--点处理后获取检测项--提交
       commitCheckTaskList: qianzhuione + '/quality/handCheck/commitCheckResults',
+      // 根据工单获取批次下拉
+      getBatchList: qianzhuione + '/quality/handCheck/getBatchList',
     },
     // 历史记录
     Records: {