留样检验新增查询字段

src/pages/quality/BpCheck/index.vue

@@ -25,7 +25,7 @@
         <jPicker sureColor="#ff0000" moren="请选择是否合格" @bindpicker="selectIsQualified" showKey="key" valKey="value" :val="form.isQualified" :options="optionResults" />
       </u-form-item>
 
-      <u-form-item label="不良数量（PC）"  label-width="230rpx">
+      <u-form-item label="不良数量（车）"  label-width="230rpx">
         <span style="width: 100%;color: #c0c4cc" @click="checkShowDefects" v-if="!form.badNum">请选择不良项</span>
         <span v-if="form.badNum">{{form.badNum}}</span>
       </u-form-item>

src/pages/quality/SampleCheck/index.vue

@@ -12,6 +12,12 @@
       <u-form-item label="工单号" label-width="18vw">
         <u-search placeholder="请输入工单号" :focus="true" v-model="queryParams.workOrderCodeSap" @search="getList" :show-action="false"></u-search>
       </u-form-item>
+      <u-form-item label="批次号" label-width="18vw">
+        <u-search placeholder="请输入批次号" :focus="true" v-model="queryParams.incomeBatchNo" @search="getList" :show-action="false"></u-search>
+      </u-form-item>
+      <u-form-item label="物料名称" label-width="18vw">
+        <u-search placeholder="请输入物料名称" :focus="true" v-model="queryParams.materialName" @search="getList" :show-action="false"></u-search>
+      </u-form-item>
 
     </u-form>
 
@@ -191,7 +197,9 @@ export default class SampleCheck extends BasePage {
     secondDate: undefined,
     thirdDate: undefined,
     searchFlag:"1",
-    workOrderCodeSap:undefined
+    workOrderCodeSap:undefined,
+    incomeBatchNo:undefined,
+    materialName:undefined
   };
   total = 0;
   list: any = [];
@@ -234,6 +242,7 @@ export default class SampleCheck extends BasePage {
   resultsOption =[
     { key:"合格", value: "Y" },
     { key:"不合格", value: "N" },
+    { key:"未复检", value: "X" },
   ]
 
   yesOrNotOption = [
@@ -299,10 +308,14 @@ export default class SampleCheck extends BasePage {
     if (item.resultList) {
       for (const i of item.resultList){
         if (i.checkTimes === num){
+          if (i.qualified === 'X'){
+            return true
+          }else {
             return false
           }
         }
       }
+    }
 
     const diff = this.timeDifference(item.sampleTime);
     return diff >= num;
@@ -336,7 +349,11 @@ export default class SampleCheck extends BasePage {
 
     for (const i of item.resultList){
       if (i.checkTimes === num){
-        return moment(i.createTime).format('YYYY-MM-DD HH:mm:ss');
+        let str = ''
+        if (i.qualified === 'X'){
+          str = '(未复检)'
+        }
+        return moment(i.createTime).format('YYYY-MM-DD HH:mm:ss') + str;
       }
     }