质量抽样数量问题调整，部分报修审核功能

src/pages/equipment/RepairAudit/Audit.vue

@@ -233,6 +233,7 @@ export default class ProductionREQ extends BasePage {
     await this.model.getTaskRecord(orderId);
     this.histroyItem = this.model.getTaskRecordList;
     this.imgList = this.histroyItem.files;
+    await this.model.getTeamList();
   }
   changeradio1(checkResult) {
     console.log(checkResult);

src/pages/equipment/RepairAudit/index.vue

@@ -52,9 +52,9 @@ import moment from 'moment';
 export default class RepairAudit extends BasePage {
   model = model;
   AuditStatusList: any = [
-    { label: '待审核', value: '待审核' },
+    { label: '待审核', value: '2' },
-    { label: '审核通过', value: '审核通过' },
+    { label: '审核通过', value: '1' },
-    { label: '驳回', value: '驳回' },
+    { label: '驳回', value: '0' },
   ];
   AuditStatusType: any = {};
   list: any = [

src/pages/equipment/RepairAudit/model.ts

@@ -28,27 +28,13 @@ export class RepairAudit extends VuexModule {
     const getTaskRecordList = result.data;
     return { getTaskRecordList };
   }
-  //巡检列表巡检记录
+  teamList: any = [];
-  OrderInfList: any = [];
-  @MutationAction
-  async getInspectionOrderInfo(params: any) {
-    const result: any = await http.post(url.lanjuequipment.product.Inspection.getInspectionOrderInfo, params);
-    const OrderInfList: [] = result.data;
-    return { OrderInfList };
-  }
-  SubmitCode: any = '';
   //是否开机保养
   @MutationAction
-  async startMaintenanceTask(params: any) {
+  async getTeamList() {
-    const result: any = await http.get(url.lanjuequipment.product.Upkeep.startMaintenanceTask, { params });
+    const result: any = await http.get(url.lanjuequipment.product.RepairAudit.getMaintenanceTeamList);
-    const SubmitCode: [] = result;
+    const teamList: [] = result.data;
-    return { SubmitCode };
+    return { teamList };
-  }
-  @MutationAction
-  async updateInspectionRecord(params: any) {
-    const result: any = await http.post(url.lanjuequipment.product.Inspection.updateInspectionRecord, params);
-    const SubmitCode: [] = result;
-    return { SubmitCode };
   }
   Checklist: any = [];
   @MutationAction

src/pages/login/login/index.vue

@@ -142,7 +142,7 @@ export default class LoginPage extends BasePage {
     // console.log('Version////', this.Version);
   }
   ///********版本号修改区域**********
-  version = '0.0.91'; //正式版本号
+  version = '0.0.92'; //正式版本号
   //version = '0.0.6'; //测试版本号
   //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本****************
   //isTest = true;

src/pages/quality/Materialinspection/index.vue

@@ -110,9 +110,9 @@
             <div class="details">
               <div>供应商单位 : {{ clickitem.supplierName }}</div>
             </div>
-            <div v-if="selectList.value === 'checkTypeCP'" class="details">
+            <!-- <div v-if="selectList.value === 'checkTypeCP'" class="details">
               <div style="display: flex; flex-direction: row"><view style="line-height: 70rpx">样本数量: </view><u-input border v-model="sampleQuality"></u-input></div>
-            </div>
+            </div> -->
           </div>
           <!-- <div style="text-align: center">
             <u-button style="width: 100%; height: 35px; margin: auto" @click="onOk" size="mini" type="primary">同步信息</u-button>
@@ -529,7 +529,7 @@ export default class PurchaseWHSRM extends BasePage {
   deptlist: any = [];
   supplierlist: any = [];
   abnormallist: any = [];
-  sampleQuality = null; //成品检验样本数量
+  //sampleQuality = null; //成品检验样本数量
   // 引入原生插件
   // 调用插件的 mpaasScan 方法
 
@@ -988,7 +988,7 @@ export default class PurchaseWHSRM extends BasePage {
   nopoup() {
     this.show = false;
     this.form3.barCodewl = '';
-    this.sampleQuality = null;
+    //this.sampleQuality = null;
     this.formdata.attr3 = '';
   }
   async getlist() {
@@ -1187,13 +1187,13 @@ export default class PurchaseWHSRM extends BasePage {
         }
       }
     }
-    if (this.selectList.value == 'checkTypeCP' && !this.sampleQuality) {
+    // if (this.selectList.value == 'checkTypeCP' && !this.sampleQuality) {
-      (this.$refs.uToast as any).show({
+    //   (this.$refs.uToast as any).show({
-        title: '请输入样本数量',
+    //     title: '请输入样本数量',
-        type: 'default',
+    //     type: 'default',
-      });
+    //   });
-      return;
+    //   return;
-    }
+    // }
     // if (this.isquality) {
     //   (this.$refs.uToast as any).show({
     //     title: '数量不能为空',
@@ -1235,9 +1235,9 @@ export default class PurchaseWHSRM extends BasePage {
       } else {
         item.files = [];
       }
-      if (this.selectList.value === 'checkTypeCP') {
+      // if (this.selectList.value === 'checkTypeCP') {
-        item.sampleQuality = this.sampleQuality;
+      //   item.sampleQuality = this.sampleQuality;
-      }
+      // }
     });
     let query = {};
     if (this.selectList.value == 'checkTypeSC' || this.selectList.value == 'checkTypeSCXJ' || this.selectList.value == 'checkTypeCP') {
@@ -1431,7 +1431,7 @@ export default class PurchaseWHSRM extends BasePage {
   }
   clear() {
     this.formdata.sampleQuality = null;
-    this.sampleQuality = null;
+    //this.sampleQuality = null;
     this.formdata.attr3 = '';
   }
   confirm() {
@@ -1616,7 +1616,7 @@ export default class PurchaseWHSRM extends BasePage {
           if (res.confirm) {
             this.SaveDraft();
             this.show = false;
-            this.sampleQuality = null;
+            //this.sampleQuality = null;
           } else if (res.cancel) {
             console.log('不关闭');
           }
@@ -1634,7 +1634,7 @@ export default class PurchaseWHSRM extends BasePage {
             if (res.confirm) {
               this.SaveDraft();
               this.show = false;
-              this.sampleQuality = null;
+              //this.sampleQuality = null;
             } else if (res.cancel) {
               console.log('不关闭');
             }
@@ -1691,9 +1691,9 @@ export default class PurchaseWHSRM extends BasePage {
       } else {
         item.files = [];
       }
-      if (this.selectList.value === 'checkTypeCP') {
+      // if (this.selectList.value === 'checkTypeCP') {
-        item.sampleQuality = this.sampleQuality;
+      //   item.sampleQuality = this.sampleQuality;
-      }
+      // }
     });
 
     let params = {

src/utils/url.ts

@@ -253,6 +253,7 @@ export const url = {
       RepairAudit: {
         getBXList: qianzhuione + '/device/devicePDA/getBXList', //审核列表查询
         getBXDetail: qianzhuione + '/device/devicePDA/getBXDetail', //审核详情查询
+        getMaintenanceTeamList: qianzhuione + '/device/equTeam/getMaintenanceTeamList', //维修班组
       },
     },
   },