修改质量检验新增字段

src/pages/quality/Belowstandard/index.vue

@@ -873,9 +873,6 @@ export default class PurchaseWHSRM extends BasePage {
     padding: 20rpx;
   }
 
-  .button-bar {
-  }
-
   .poupbutton {
     display: flex;
     justify-content: space-around;

src/pages/quality/Materialinspection/index.vue

@@ -96,6 +96,7 @@
                 单位:mm
               </div>
             </div>
+
             <!-- <div v-for="(item1, index1) in item.standardList" :key="index1">
               <div class="item1 item2" v-if="item1.standardType == 'qualitative'">
                 <div>检查标准: {{ item1.standardName }}</div>
@@ -118,6 +119,28 @@
             </div> -->
           </view>
         </view>
+        <!-- sampleQuality：抽样数量
+		noOkQuality:不合格数量（只来料、入库有）
+		aNoOkquality：A类不良（只过程有）
+		bNoOkquality：B类不良（只过程有）
+		cNoOkquality：C类不良（只过程有） -->
+        <u-form class="Belowsform3" ref="form" label-width="230rpx" label-position="left">
+          <u-form-item label="抽样数量:">
+            <u-input v-model="formdata.sampleQuality" placeholder="" type="number" />
+          </u-form-item>
+          <u-form-item v-if="isshow1" label="不合格数量:">
+            <u-input v-model="formdata.noOkQuality" placeholder="" type="number" />
+          </u-form-item>
+          <u-form-item v-if="isshow3" label="A类不良:">
+            <u-input v-model="formdata.aNoOkquality" placeholder="" type="number" />
+          </u-form-item>
+          <u-form-item v-if="isshow3" label="B类不良:">
+            <u-input v-model="formdata.bNoOkquality" placeholder="" type="number" />
+          </u-form-item>
+          <u-form-item v-if="isshow3" label="C类不良:">
+            <u-input v-model="formdata.cNoOkquality" placeholder="" type="number" />
+          </u-form-item>
+        </u-form>
         <view class="poupbutton" style="margin-top: 10px">
           <div>
             <u-button style="width: 100px; height: 35px" @click="onOk" size="mini" type="primary">提交</u-button>
@@ -250,8 +273,18 @@ export default class PurchaseWHSRM extends BasePage {
   nodelist: any = '';
   detaillistceshi: any = [];
   clickitem: any = '';
+  formdata: any = {
+    sampleQuality: null,
+    noOkQuality: null,
+    aNoOkquality: null,
+    bNoOkquality: null,
+    cNoOkquality: null,
+  };
   isvalue = false;
   isfocus = false;
+  isshow1 = false;
+  isshow2 = false;
+  isshow3 = false;
   //收货按钮
   tagClick(index) {
     this.tagslist.splice(index, 1);
@@ -297,6 +330,19 @@ export default class PurchaseWHSRM extends BasePage {
   async onPass(item) {
     console.log('1234567', item);
     this.clickitem = item;
+    let labelname = null;
+    this.nodelist.forEach((item) => {
+      if (item.orderCode == this.selectList.value) {
+        labelname = item.checkName;
+      }
+    });
+    if (labelname == '来料检验') {
+      this.isshow1 = true;
+    } else if (labelname == '成品入库检验') {
+      this.isshow1 = true;
+    } else if (labelname == '过程检验') {
+      this.isshow3 = true;
+    }
     let belongTo = item.recordId;
     await this.model.getCheckTaskList(belongTo);
     this.detaillistceshi = this.model.CheckTaskList;
@@ -382,11 +428,13 @@ export default class PurchaseWHSRM extends BasePage {
     this.isvalue = false;
     console.log(this.selectList, this.detaillistceshi);
     let labelname = null;
+
     this.nodelist.forEach((item) => {
       if (item.orderCode == this.selectList.value) {
         labelname = item.checkName;
       }
     });
+
     this.detaillistceshi.forEach((item) => {
       if (item.propertyCode == 1) {
         if (item.actualValue == null || item.actualValue == '') {
@@ -403,11 +451,50 @@ export default class PurchaseWHSRM extends BasePage {
       });
       return;
     }
+    if (this.formdata.sampleQuality == null || this.formdata.sampleQuality == '') {
+      (this.$refs.uToast as any).show({
+        title: '抽样数量不能为空',
+        type: 'default',
+      });
+      return;
+    }
+    if (this.isshow1) {
+      if (this.formdata.noOkQuality == null || this.formdata.noOkQuality == '') {
+        (this.$refs.uToast as any).show({
+          title: '不合格数量不能为空',
+          type: 'default',
+        });
+        return;
+      }
+    }
+    if (this.isshow3) {
+      if (this.formdata.aNoOkquality == null || this.formdata.aNoOkquality == '') {
+        (this.$refs.uToast as any).show({
+          title: 'A类不良不能为空',
+          type: 'default',
+        });
+        return;
+      }
+      if (this.formdata.bNoOkquality == null || this.formdata.bNoOkquality == '') {
+        (this.$refs.uToast as any).show({
+          title: 'B类不良不能为空',
+          type: 'default',
+        });
+        return;
+      }
+      if (this.formdata.cNoOkquality == null || this.formdata.cNoOkquality == '') {
+        (this.$refs.uToast as any).show({
+          title: 'C类不良不能为空',
+          type: 'default',
+        });
+        return;
+      }
+    }
     let query = {};
     if (labelname == '来料检验') {
       query = {
-        sampleQuality: this.clickitem.sampleQuality,
+        sampleQuality: this.formdata.sampleQuality,
-        noOkQuality: this.clickitem.noOkQuality,
+        noOkQuality: this.formdata.noOkQuality,
         updateBy: session.userName,
         factoryCode: session.PoolName,
         typeCode: this.selectList.value,
@@ -417,8 +504,8 @@ export default class PurchaseWHSRM extends BasePage {
       };
     } else if (labelname == '成品入库检验') {
       query = {
-        sampleQuality: this.clickitem.sampleQuality,
+        sampleQuality: this.formdata.sampleQuality,
-        noOkQuality: this.clickitem.noOkQuality,
+        noOkQuality: this.formdata.noOkQuality,
         updateBy: session.userName,
         factoryCode: session.PoolName,
         typeCode: this.selectList.value,
@@ -428,10 +515,10 @@ export default class PurchaseWHSRM extends BasePage {
       };
     } else if (labelname == '过程检验') {
       query = {
-        sampleQuality: this.clickitem.sampleQuality,
+        sampleQuality: this.formdata.sampleQuality,
-        aNoOkquality: 'A类不良',
+        aNoOkquality: this.formdata.aNoOkquality,
-        bNoOkquality: 'B类不良',
+        bNoOkquality: this.formdata.bNoOkquality,
-        cNoOkquality: 'C类不良',
+        cNoOkquality: this.formdata.cNoOkquality,
         updateBy: session.userName,
         factoryCode: session.PoolName,
         typeCode: this.selectList.value,
@@ -440,18 +527,6 @@ export default class PurchaseWHSRM extends BasePage {
         qcCheckTaskDetails: this.detaillistceshi,
       };
     }
-    // sampleQuality：抽样数量
-    // noOkQuality:不合格数量（只来料、入库有）
-    // aNoOkquality：A类不良（只过程有）
-    // bNoOkquality：B类不良（只过程有）
-    // cNoOkquality：C类不良（只过程有）
-
-    // factoryCode:工厂编码
-    // typeCode：大检验节点编码
-    // updateBy：当前登陆人
-    // checkType：检验节点编码
-    // orderCode:订单编码
-
     await this.model.commitCheckTaskList(query);
     if (this.model.SubmitCode.code == '200') {
       (this.$refs.uToast as any).show({
@@ -739,23 +814,6 @@ export default class PurchaseWHSRM extends BasePage {
     //   font-size: 24rpx;
     // }
   }
-  .form3 {
-    padding: 20rpx;
-    //border-radius: 10rpx;
-    //box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2);
-    .poupitem {
-      display: flex;
-      flex-direction: row;
-      justify-content: space-around;
-      margin: 20rpx;
-      .pouptitle {
-        width: 25%;
-      }
-      .poupcontent {
-        border: 1px solid rgba(128, 128, 128, 0.2);
-      }
-    }
-  }
   .poupbutton {
     display: flex;
     justify-content: space-around;
@@ -868,5 +926,101 @@ export default class PurchaseWHSRM extends BasePage {
       }
     }
   }
+  .Belowsform3 {
+    background-color: #fff;
+    padding: 7px 8px 7px 12px;
+    .u-form-item {
+      line-height: 35rpx;
+      font-size: 16px;
+    }
+    .photoList {
+      display: flex;
+      padding-top: 12rpx;
+
+      .chooseBtn {
+        width: 202rpx;
+        height: 202rpx;
+        background: #fafafa;
+        border-radius: 12rpx;
+        border: 2rpx dashed #e2e2e2;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+
+        .inner {
+          text-align: center;
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+          align-items: center;
+        }
+
+        .desc {
+          font-size: 28rpx;
+          font-weight: 400;
+          color: #24252a;
+          line-height: 40rpx;
+        }
+
+        .img {
+          width: 50rpx;
+          height: 50rpx;
+          margin-bottom: 6rpx;
+        }
+      }
+
+      .photoBox {
+        width: 202rpx;
+        height: 202rpx;
+        background: #fafafa;
+        border-radius: 12rpx;
+        position: relative;
+
+        .closeBtn {
+          position: absolute;
+          top: -12rpx;
+          right: -12rpx;
+          z-index: 2;
+          width: 36rpx;
+          height: 36rpx;
+
+          .img {
+            width: 36rpx;
+            height: 36rpx;
+          }
+        }
+
+        .img {
+          width: 202rpx;
+          height: 202rpx;
+          border-radius: 12rpx;
+        }
+      }
+
+      .itemBox {
+        flex: 0 0 202rpx;
+        margin-right: 20rpx;
+
+        &:last-child {
+          margin-right: 0;
+        }
+      }
+    }
+  }
+  ::v-deep .input1 .u-input__input {
+    //background: rgb(233 231 231 / 38%);
+    background-color: #f0f0f0;
+  }
+  ::v-deep .uni-input-placeholder {
+    font-weight: 500;
+    left: 10px;
+  }
+  ::v-deep .uni-textarea-placeholder {
+    font-weight: 500;
+  }
+  ::v-deep .Belowsform3 .uni-input-input {
+    width: 97%;
+    border: 1px solid #dcdfe6;
+  }
 }
 </style>

src/pages/quality/index.vue

@@ -83,10 +83,14 @@ export default class RawAppointment extends BasePage {
     this.newmenuList2 = this.menuList.filter((item) => item.perms == 'qualityJC');
     console.log('1234', this.menuList);
   }
-  async onLoad() {
+  async onShow() {
     await this.model.getTopTaskInfo();
     this.newmenuList3 = this.model.orderNoItemList;
   }
+  // async onLoad() {
+  //   await this.model.getTopTaskInfo();
+  //   this.newmenuList3 = this.model.orderNoItemList;
+  // }
   link(item) {
     if (item.attr1 == '检验任务') {
       uni.navigateTo({