From 21126be5db30de31be135dbdb53f398414f61e08 Mon Sep 17 00:00:00 2001
From: "LAPTOP-R6EHHS26\\86155" <2217640373@qq.com>
Date: Wed, 27 Mar 2024 12:40:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=8C=81=E8=B4=A8=E9=87=8F=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/bad-type/bad-type.vue          | 114 +++++++++++
 src/pages/equipment/Repairbx/index.vue        |   5 +-
 .../quality/Materialinspection/index.vue      | 180 +++++++++++-------
 src/pages/quality/Materialinspection/model.ts |  15 ++
 src/pages/quality/Records/index.vue           |  39 +++-
 src/pages/quality/Records/model.ts            |  15 ++
 src/utils/url.ts                              |   2 +
 7 files changed, 293 insertions(+), 77 deletions(-)
 create mode 100644 src/components/bad-type/bad-type.vue

diff --git a/src/components/bad-type/bad-type.vue b/src/components/bad-type/bad-type.vue
new file mode 100644
index 0000000..9794e87
--- /dev/null
+++ b/src/components/bad-type/bad-type.vue
@@ -0,0 +1,114 @@
+<template>
+  <view class="jPicker">
+    <u-modal v-model="isshow" class="modal" :show-cancel-button="true" :show-title="false" @cancel="cancel" @confirm="confirm">
+      <div class="upload-name">
+        <u-field v-for="(item, index) in tagslist" :key="index" v-model="item.numberall" :label="item.label" placeholder="" @input="handleInput(index)" :focus="isfocus"></u-field>
+      </div>
+    </u-modal>
+  </view>
+</template>
+
+<script lang="ts">
+/**
+ * 选择组件
+ * @property {Array} options 选择数组
+ * @property {String} showKey 显示的对象键名
+ * @property {String} val 默认选中下标
+ * @property {String} valKey 取值的对象键名
+ * @property {Boolean} disabled 是否只读
+ * * @property {String} moren 是否只读
+ * @event {Function} position 搜索框位置
+ * @event {Function} sure 确认事件
+ * @example <jPicker :disabled="false" class="cont" @sure="bindPickerChange($event,'TYPE')" showKey="Name" valKey="Value" :val="CurrentType" :options="FilterArray" />
+ */
+export default {
+  name: 'badType',
+  data() {
+    return {
+      tagslist: [],
+      //moren: this.moren,
+      isshow: false,
+      tagsvalue: '111',
+      isfocus: false,
+      searchPosition: 'middle',
+      //picker样式
+      // unSelStyle:'',
+      //'background-color:rgba(0, 74, 255, 0.44);',//'background-color:rgba(220, 250, 9, 0.44);',rgba(250, 9, 9, 0.44)
+      selStyle: 'height:50px;',
+      keyWord: '',
+      mobile: '',
+      itemindex: '',
+      tagslistcopy: [],
+    };
+  },
+  props: ['options', 'moren', 'showKey', 'valKey', 'val', 'position', 'disabled', 'bgColor', 'sureColor', 'focus'],
+  //选项数组，列表显示的对象键名，取值的对象键名,默认选中值,搜索框位置,是否禁用,整体背景色,确认键颜色
+  watch: {
+    options(n) {
+      console.log('22998', n);
+    },
+    val: {},
+    // 原始bug
+    // uniapp 无法监听prop对象,使用computed替代方案解决组件缓存问题
+    reset(v) {
+      if (v === '' || v === undefined || v === null) {
+        this.nSel = -1;
+      }
+    },
+  },
+  computed: {
+    reset() {
+      return this.val;
+    },
+  },
+  methods: {
+    open(item, index) {
+      console.log(item, index);
+      this.itemindex = index;
+      this.isshow = true;
+      this.tagslist = JSON.parse(JSON.stringify(item.babtype));
+      this.tagslistcopy = JSON.parse(JSON.stringify(item.babtype));
+    },
+    handleInput(index) {
+      let value = this.tagslist[index].numberall;
+      // 移除非数字字符
+      const newValue = value.replace(/[^\d]/g, '');
+      // 更新输入框的值
+      this.$set(this.tagslist, index, { ...this.tagslist[index], numberall: newValue });
+    },
+    cancel() {
+      console.log('22998111', this.tagslist, this.itemindex);
+      this.tagslist = this.tagslistcopy;
+      this.tagslist.forEach((item) => {
+        if (item.numberall == '') {
+          item.numberall = 0;
+        }
+      });
+      this.$emit('bindtypelist', this.tagslist, this.itemindex);
+    },
+    confirm() {
+      this.tagslist.forEach((item) => {
+        if (item.numberall == '') {
+          item.numberall = 0;
+        }
+      });
+      this.$emit('bindtypelist', this.tagslist, this.itemindex);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.jPicker {
+  width: 100%;
+
+  .showLine {
+    // border-left:1px solid #000000;
+    width: 100%;
+    display: inline-block;
+  }
+  .upload-name {
+    padding: 10px 15px;
+  }
+}
+</style>
diff --git a/src/pages/equipment/Repairbx/index.vue b/src/pages/equipment/Repairbx/index.vue
index f745427..30049fd 100644
--- a/src/pages/equipment/Repairbx/index.vue
+++ b/src/pages/equipment/Repairbx/index.vue
@@ -82,7 +82,7 @@
         </u-col>
       </u-row>
     </view>
-    <u-toast ref="uToast" />
+    <!-- <u-toast ref="uToast" /> -->
   </view>
 </template>
 <script lang="ts">
@@ -171,6 +171,9 @@ export default class ChangePalletNew extends BasePage {
     this.formdata = {};
     this.imgList = [];
     this.orderDesc = {};
+    uni.showLoading({ title: '加载中' });
+    this.uni.showToast({ title: '成功' });
+    // this.customToast('请扫码设备编码');
     if (this.orderNo == '' || this.orderNo.length == 0) {
       (this.$refs.uToast as any).show({
         title: '请扫码条码',
diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue
index 09e77cb..a0a6066 100644
--- a/src/pages/quality/Materialinspection/index.vue
+++ b/src/pages/quality/Materialinspection/index.vue
@@ -12,6 +12,14 @@
       <!-- 订单 -->
       <!-- <u-form-item label="检验节点"> -->
       <jPicker sureColor="#ff0000" :moren="moren" @bindpicker="selectProductlocCode" showKey="label" valKey="value" :val="selectList.value" :options="model.selectList" />
+
+      <!-- <u-input @blur="onblur()" @focus="onfocus" @click="onclick" :border="true" v-model="selectvalue" placeholder="请选择检验节点" style="overflow: hidden" /> -->
+      <!-- </u-form-item> -->
+    </u-form>
+    <u-form class="form" ref="form" label-width="180rpx" style="margin-top: 10px">
+      <!-- 订单 -->
+      <!-- <u-form-item label="检验节点"> -->
+      <jPicker sureColor="#ff0000" :moren="moren4" @bindpicker="selectProductlocCode3" showKey="label" valKey="value" :val="selectList1.value" :options="model.selectList1" />
       <!-- <u-input @blur="onblur()" @focus="onfocus" @click="onclick" :border="true" v-model="selectvalue" placeholder="请选择检验节点" style="overflow: hidden" /> -->
       <!-- </u-form-item> -->
     </u-form>
@@ -52,6 +60,12 @@
                 <view> {{ item.quality }} </view>
               </view>
             </view>
+            <view class="row-list">
+              <view class="row-list-item">
+                <view class="list-item"> 检验位置: </view>
+                <view> {{ item.checkLocName }} </view>
+              </view>
+            </view>
             <view a:if="true" class="righttitle">
               <view @click.stop="onPass(item)" class="boder-icon-rigth"> 处理 </view>
             </view>
@@ -81,6 +95,9 @@
               <div>收货数量 : {{ clickitem.quality }}</div>
               <div style="margin-left: 30px">检验状态 : {{ clickitem.checkStatus == 0 ? '待检验' : '检验完成' }}</div>
             </div>
+            <div class="details">
+              <div>检验位置 : {{ clickitem.checkLocName }}</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>
@@ -98,15 +115,16 @@
                 </u-radio-group>
               </div>
             </div>
-            <div class="item1" style="color: #000">
+            <div class="item1" style="color: #000; position: relative">
               <!-- <div class="item1">检查结果: {{ item.itemMethod }}</div> -->
-              <jPicker style="border: 1px solid #ffffff; color: #000" :moren="moren3" @bindpicker="selectProductlocCode2(index, $event)" showKey="label" valKey="value" :val="item.defectCode" :options="model.locList1" />
-              <u-input placeholder="请输入不合格数量" style="background: #fafafa; border: 1px dashed #e2e2e2; margin-top: 10px" @blur="changecollect()" :border="true" v-model="item.defectQuality" type="number" :focus="isfocus" />
+              <div class="Overlay" @click="focustype(item, item.actualValue, index)" style="width: 100%; height: 100%; position: absolute; top: 0; left: 0; z-index: 666"></div>
+              <!-- <jPicker style="border: 1px solid #ffffff; color: #000" :moren="moren3" @bindpicker="selectProductlocCode2(index, $event)" showKey="label" valKey="value" :val="item.defectCode" :options="model.locList1" /> -->
+              <u-input placeholder="请输入不合格数量" :disabled="item.defectName == null ? true : true" style="background: #fafafa; border: 1px dashed #e2e2e2; margin-top: 10px" :border="true" v-model="item.defectNames" />
             </div>
             <div class="item1 item2" v-if="item.propertyCode == '1'">
               <div class="input-box" id="input-box1">
                 实际值:
-                <input class="input" v-model="item.actualValue" @focus="focus(item, item.actualValue, index)" @change="changeinput(item)" @input="input(item)" type="text" name="" id="" />
+                <input class="input" v-model="item.actualValue" @focus="focus(item, item.actualValue, index)" type="text" name="" id="" />
                 单位:mm
               </div>
             </div>
@@ -185,7 +203,7 @@
       </u-popup>
       <view v-if="show" class="mask"></view>
     </view>
-    <u-select v-model="showselect" mode="mutil-column-auto" :list="selectlist" @confirm="confirmselect"></u-select>
+    <u-select v-model="showselect" mode="mutil-column-auto" :list="selectlist"></u-select>
     <u-modal v-model="isshow" class="modal" :show-cancel-button="true" :show-title="false" @cancel="cancel" @confirm="confirm">
       <div class="tagsbox">
         <u-tag v-for="(item, index) in tagslist" class="tags" :key="index" :text="item" type="info" closeable @close="tagClick(index)" />
@@ -199,6 +217,7 @@
         </div>
       </div>
     </u-modal>
+    <badtype sureColor="#ff0000" ref="babtype" :showtype="isshowtype" @bindtypelist="selectbabTypelist" showKey="label" valKey="value" :options="model.locList1" />
     <u-toast ref="uToast" />
   </view>
 </template>
@@ -206,6 +225,7 @@
 import { Component } from 'vue-property-decorator';
 import { BasePage } from '@/components/base/page';
 import jPicker from '@/components/J-Picker/jPicker.vue';
+import badtype from '@/components/bad-type/bad-type.vue';
 import model from './model';
 import { session } from '@/store/modules/session';
 const mpaasScanModule: any = uni.requireNativePlugin('Mpaas-Scan-Module');
@@ -213,6 +233,7 @@ const mpaasScanModule: any = uni.requireNativePlugin('Mpaas-Scan-Module');
 @Component({
   components: {
     jPicker,
+    badtype,
   },
 })
 export default class PurchaseWHSRM extends BasePage {
@@ -220,6 +241,7 @@ export default class PurchaseWHSRM extends BasePage {
   moren = '请选择检验节点';
   moren2 = '请选择批次号';
   moren3 = '请选择不良分类';
+  moren4 = '请选择检验位置';
   list: any = [];
   show = false;
   showselect = false;
@@ -240,6 +262,7 @@ export default class PurchaseWHSRM extends BasePage {
     },
   ];
   selectList: any = {};
+  selectList1: any = {};
   defectCodeList: any = {};
   // remove: any = {};
   // async onReady() {
@@ -308,6 +331,7 @@ export default class PurchaseWHSRM extends BasePage {
   tagslist: any = [];
   detailsinfo: any = [];
   nodelist: any = '';
+  nodelist1: any = '';
   detaillistceshi: any = [];
   detaillistdefects: any = [];
   clickitem: any = '';
@@ -331,6 +355,8 @@ export default class PurchaseWHSRM extends BasePage {
   DefectListPDAlist: any = [];
   defectCodelist: any = [];
   imgurl: any = 'http://lj08.cn/21001871815240307020600048115350';
+  // 不良类型
+  isshowtype = false;
   // 引入原生插件
   // 调用插件的 mpaasScan 方法
 
@@ -353,24 +379,20 @@ export default class PurchaseWHSRM extends BasePage {
     //   this.isfocus = true;
     // });
   }
-  onShow() {
-    console.log('222221');
-  }
   async onLoad(options) {
     this.getselectlist();
-    console.log(options);
     if (options.listitem) {
       let str = decodeURIComponent(options.listitem);
       if (str) {
         this.detailsinfo = JSON.parse(str);
         this.selectList.value = this.detailsinfo.checkType;
         this.getDefectListPDA();
-        console.log(this.detailsinfo);
         let query = {
           factoryCode: session.PoolName,
           checkManCode: session.userName,
           checkStatus: 0,
           checkType: this.detailsinfo.checkType,
+          checkLoc: this.selectList1.value,
         };
         await this.model.getCheckTaskListall(query);
         this.list = this.model.CheckTaskListall;
@@ -379,7 +401,9 @@ export default class PurchaseWHSRM extends BasePage {
   }
   async getselectlist() {
     await this.model.getCheckType();
+    await this.model.getcheckLocList();
     this.nodelist = this.model.orderNoItemList;
+    this.nodelist1 = this.model.orderNoItemList1;
   }
   async getDefectListPDA() {
     let query1 = {
@@ -391,13 +415,13 @@ export default class PurchaseWHSRM extends BasePage {
     this.DefectListPDAlist = this.model.locList1;
     this.DefectListPDAlist.forEach((item) => {
       let a: any = {};
+      a.label = item.label;
       a.defectCode = item.value;
       a.numberall = 0;
       this.defectCodelist.push(a);
     });
   }
   async onPass(item) {
-    console.log('1234567', item, this.selectList);
     this.clickitem = item;
     let query1 = {
       factoryCode: session.PoolName,
@@ -405,7 +429,6 @@ export default class PurchaseWHSRM extends BasePage {
     };
     await this.model.getBatchList(query1);
     let labelname = this.selectList.value;
-    console.log(this.isshow3);
     if (labelname == 'checkTypeSCXJ') {
       this.isshow3 = true;
       if (item.incomeBatchNo) {
@@ -421,7 +444,6 @@ export default class PurchaseWHSRM extends BasePage {
       belongTo: belongTo,
       checkType: this.selectList.value,
     };
-    console.log(this.model, '11111', this.clickitem.sampleQuality);
     await this.model.getCheckTaskList(query);
 
     if (this.clickitem.sampleQuality != null) {
@@ -441,6 +463,8 @@ export default class PurchaseWHSRM extends BasePage {
       item.checkType = this.selectList.value;
       item.orderCode = this.clickitem.orderNo;
       item.files = [];
+      item.babtype = this.defectCodelist;
+      item.defectlabel = null;
     });
     this.show = true;
   }
@@ -448,7 +472,7 @@ export default class PurchaseWHSRM extends BasePage {
     console.log(item, value, index);
   }
   radioChange(e) {
-    console.log(e, '11111');
+    console.log(e);
   }
   async selectProductlocCode(e: any) {
     this.selectList = e.pickerName;
@@ -457,25 +481,84 @@ export default class PurchaseWHSRM extends BasePage {
       checkManCode: session.userName,
       checkStatus: 0,
       checkType: this.selectList.value,
+      checkLoc: this.selectList1.value,
     };
     this.getDefectListPDA();
     await this.model.getCheckTaskListall(query);
-    console.log(this.model.CheckTaskListall);
     this.list = this.model.CheckTaskListall;
-    console.log(this.selectList, '222222');
     // let params = {
     //   productionState: this.productCodelocList.value.toString(),
     // };
     // await this.model.getpalletLocation(params); //参数：成型区2，烘房3
   }
+  async selectbabTypelist(babtypelist, index) {
+    this.detaillistceshi[index].babtype = babtypelist;
+    let defectCode = [];
+    let defectQuality = [];
+    let defectlabel = [];
+    // a.label = item.label;
+    //   a.defectCode = item.value;
+    //   a.numberall = 0;
+    babtypelist.forEach((item) => {
+      if (item.numberall != 0) {
+        let a = item.label + ':' + item.numberall;
+        defectCode.push(item.defectCode);
+        defectQuality.push(item.numberall);
+        defectlabel.push(a);
+      }
+    });
+    this.detaillistceshi[index].defectCodes = defectCode.join(',');
+    this.detaillistceshi[index].defectQualitys = defectQuality.join(',');
+    this.detaillistceshi[index].defectNames = defectlabel.join(',');
+    const mergedObject = {};
+    for (let index = 0; index < this.detaillistceshi.length; index++) {
+      this.detaillistceshi[index].babtype.forEach((obj) => {
+        const { numberall, defectCode } = obj;
+        if (!mergedObject[defectCode]) {
+          mergedObject[defectCode] = parseInt(numberall);
+        } else {
+          mergedObject[defectCode] += parseInt(numberall);
+        }
+      });
+    }
+    const array3 = Object.keys(mergedObject).map((defectCode) => ({
+      defectCode,
+      value: mergedObject[defectCode],
+    }));
+
+    for (let index = 0; index < array3.length; index++) {
+      this.detaillistdefects.forEach((item) => {
+        if (item.defectCode == array3[index].defectCode) {
+          if (item.noOkQuality == null) {
+            item.noOkQuality = 0;
+          }
+          item.noOkQuality = array3[index].value;
+        }
+      });
+    }
+  }
   async selectProductlocCode1(e: any) {
     this.incomeBatchNo = e.pickerName;
   }
-  async selectProductlocCode2(index, e: any) {
-    console.log(index, e);
-    this.defectCodeList = e.pickerName;
-    this.detaillistceshi[index].defectCode = this.defectCodeList.value;
-    this.changecollect();
+  async selectProductlocCode3(e: any) {
+    this.selectList1 = e.pickerName;
+    let query = {
+      factoryCode: session.PoolName,
+      checkManCode: session.userName,
+      checkStatus: 0,
+      checkType: this.selectList.value,
+      checkLoc: this.selectList1.value,
+    };
+    this.getDefectListPDA();
+    await this.model.getCheckTaskListall(query);
+    this.list = this.model.CheckTaskListall;
+  }
+  focustype(item, value, index) {
+    this.isfocus = false;
+    this.$nextTick(() => {
+      this.isfocus = true;
+    });
+    (this.$refs.babtype as any).open(item, index);
   }
   focus(item, value, index) {
     console.log(item, value, index);
@@ -493,50 +576,17 @@ export default class PurchaseWHSRM extends BasePage {
     this.equipmentindex.push(index);
     this.isshow = true;
   }
-  changecollect() {
-    for (let index = 0; index < this.defectCodelist.length; index++) {
-      this.defectCodelist[index].numberall = 0;
-      this.detaillistceshi.forEach((item) => {
-        if (item.defectCode == this.defectCodelist[index].defectCode) {
-          if (item.defectQuality == null) {
-            item.defectQuality = 0;
-          }
-          this.defectCodelist[index].numberall += parseInt(item.defectQuality);
-        }
-      });
-    }
-    for (let index = 0; index < this.defectCodelist.length; index++) {
-      this.detaillistdefects.forEach((item) => {
-        if (item.defectCode == this.defectCodelist[index].defectCode) {
-          if (item.noOkQuality == null) {
-            item.noOkQuality = 0;
-          }
-          item.noOkQuality = this.defectCodelist[index].numberall;
-        }
-      });
-    }
-    console.log(this.defectCodelist, '222222');
-  }
-  changeinput(e) {
-    console.log(e);
-  }
-  input(e) {
-    console.log(e);
-  }
   nopoup() {
     this.show = false;
     this.form3.barCodewl = '';
   }
   onblur() {
-    console.log('333');
     this.showselect = true;
   }
   onfocus() {
-    console.log('222');
     this.showselect = false;
   }
   onclick() {
-    console.log('111');
     this.showselect = true;
   }
   async getlist() {
@@ -545,6 +595,7 @@ export default class PurchaseWHSRM extends BasePage {
       checkManCode: session.userName,
       checkStatus: 0,
       checkType: this.selectList.value,
+      checkLoc: this.selectList1.value,
     };
     await this.model.getCheckTaskListall(query);
     this.list = this.model.CheckTaskListall;
@@ -555,7 +606,7 @@ export default class PurchaseWHSRM extends BasePage {
     this.isvalue2 = false;
     this.isvalue3 = false;
     this.isquality = false;
-    console.log(this.selectList, this.detaillistceshi);
+    console.log(this.selectList, this.nodelist, this.detaillistceshi);
     let typeCode = '';
     this.nodelist.forEach((item) => {
       if (this.selectList.value == item.orderCode) {
@@ -691,19 +742,12 @@ export default class PurchaseWHSRM extends BasePage {
   clear() {
     this.formdata.sampleQuality = null;
   }
-  confirmselect(e) {
-    console.log(e);
-    console.log(this.equipmentindex, this.tagslist);
-  }
   confirm() {
-    console.log(this.equipmentindex, this.tagslist);
-
     if (this.tagslist.length <= 0) {
       this.detaillistceshi[this.equipmentindex[0]].actualValue = null;
     } else {
       this.detaillistceshi[this.equipmentindex[0]].actualValue = JSON.stringify(this.tagslist);
     }
-    console.log(this.detaillistceshi[this.equipmentindex[0]].actualValue);
     this.tagsvalue = null;
   }
   cancel() {
@@ -732,7 +776,6 @@ export default class PurchaseWHSRM extends BasePage {
         // uni.showLoading();
         //console.log('/////',res);
         let tempFilePaths: any = res.tempFilePaths;
-        console.log(res.tempFilePaths);
 
         //      (this.$refs.uToast as any).show({
         //     title: '成功',
@@ -776,15 +819,9 @@ export default class PurchaseWHSRM extends BasePage {
               //this.filesName = [...this.filesName,data.fileName];
               //this.picUrls = this.files.join(",");
               //this.picNames = this.filesName.join(",");
-              console.log(files, this.detaillistceshi[index]);
               uni.hideLoading();
             },
-            fail: (err) => {
-              console.log(err);
-              // this.$refs.toastRef.show({
-              // 	type:"error",
-              // 	text:"上传失败！"
-              // })
+            fail: () => {
               uni.hideLoading();
             },
           });
@@ -795,7 +832,6 @@ export default class PurchaseWHSRM extends BasePage {
   deleteImg(index, index1) {
     this.detaillistceshi[index].files.splice(index1, 1);
     this.detaillistceshi[index].fileListStr = this.detaillistceshi[index].files.join(',');
-    console.log(this.detaillistceshi[index]);
   }
   // "resp_message":"success""res_presult":"http://li08.cn/21001871815240307020600048115350""res_pcode":1000}
   scanCodeOne() {
@@ -809,7 +845,6 @@ export default class PurchaseWHSRM extends BasePage {
         hideAlbum: false,
       },
       (ret) => {
-        console.log(ret);
         // uni.showModal({
         //   title: '扫码结果',
         //   // 返回值中，有三个参数 resp_code、resp_message、resp_result
@@ -835,7 +870,6 @@ export default class PurchaseWHSRM extends BasePage {
     uni.scanCode({
       scanType: ['qrCode', 'barCode'],
       success: (res) => {
-        console.log(res.result, 'ssss');
         this.orderNo = res.result;
         uni.navigateTo({
           url: `/pages/quality/Materialinspection/web?listitem=` + encodeURIComponent(res.result),
diff --git a/src/pages/quality/Materialinspection/model.ts b/src/pages/quality/Materialinspection/model.ts
index f602c5a..7e38ba2 100644
--- a/src/pages/quality/Materialinspection/model.ts
+++ b/src/pages/quality/Materialinspection/model.ts
@@ -82,6 +82,21 @@ export class Materialinspection extends VuexModule {
     }));
     return { locList1 };
   }
+  orderNoItemList1: any = [];
+  selectList1: any = [];
+  @MutationAction
+  async getcheckLocList() {
+    const result: any = await http.post(url.lanjuquality.Materialinspection.getcheckLocList, {
+      factoryCode: session.PoolName,
+    });
+    const orderNoItemList1 = result;
+    console.log(result, 'wwwwwww');
+    const selectList1 = result.map((item: any) => ({
+      label: item.defectSubclass,
+      value: item.defectCode,
+    }));
+    return { orderNoItemList1, selectList1 };
+  }
 }
 
 export default getModule(Materialinspection);
diff --git a/src/pages/quality/Records/index.vue b/src/pages/quality/Records/index.vue
index f494fdd..a4e6311 100644
--- a/src/pages/quality/Records/index.vue
+++ b/src/pages/quality/Records/index.vue
@@ -14,6 +14,13 @@
       <!-- <u-input @blur="onblur()" @focus="onfocus" @click="onclick" :border="true" v-model="selectvalue" placeholder="请选择检验节点" style="overflow: hidden" /> -->
       <!-- </u-form-item> -->
     </u-form>
+    <u-form class="form" ref="form" label-width="180rpx" style="margin-top: 10px">
+      <!-- 订单 -->
+      <!-- <u-form-item label="检验节点"> -->
+      <jPicker sureColor="#ff0000" :moren="moren4" @bindpicker="selectProductlocCode3" showKey="label" valKey="value" :val="selectList1.value" :options="model.selectList1" />
+      <!-- <u-input @blur="onblur()" @focus="onfocus" @click="onclick" :border="true" v-model="selectvalue" placeholder="请选择检验节点" style="overflow: hidden" /> -->
+      <!-- </u-form-item> -->
+    </u-form>
     <view class="scroll">
       <view v-for="item in list" :key="item.id">
         <u-form style="margin-top: 10rpx" class="form2">
@@ -51,6 +58,12 @@
                 <view> {{ item.quality }} </view>
               </view>
             </view>
+            <view class="row-list">
+              <view class="row-list-item">
+                <view class="list-item"> 检验位置: </view>
+                <view> {{ item.checkLocName }} </view>
+              </view>
+            </view>
             <view a:if="true" class="righttitle">
               <view @click.stop="onPass(item)" class="boder-icon-rigth"> 查看 </view>
             </view>
@@ -111,9 +124,9 @@
               </scroll-view>
             </div>
             <div class="item1">不良分类:</div>
-            <u-input style="background: #fafafa; border: 1px dashed #e2e2e2; padding: 5px 5px" :disabled="item.defectSubclass == null ? true : true" v-model="item.defectSubclass" placeholder="" />
-            <div class="item1">不合格数量:</div>
-            <u-input style="background: #fafafa; border: 1px dashed #e2e2e2; padding: 5px 5px" :disabled="item.defectQuality == null ? true : true" v-model="item.defectQuality" placeholder="" />
+            <u-input style="background: #fafafa; border: 1px dashed #e2e2e2; padding: 5px 5px" :disabled="item.defectSubclass == null ? true : true" v-model="item.defectNames" placeholder="" />
+            <!-- <div class="item1">不合格数量:</div>
+            <u-input style="background: #fafafa; border: 1px dashed #e2e2e2; padding: 5px 5px" :disabled="item.defectQuality == null ? true : true" v-model="item.defectQualitys" placeholder="" /> -->
             <div class="item1">不合格描述:</div>
             <u-input style="background: #fafafa; border: 1px dashed #e2e2e2; padding: 10px 5px" :disabled="item.remark == null ? true : true" v-model="item.remark" placeholder="" type="textarea" />
           </view>
@@ -177,6 +190,8 @@ export default class PurchaseWHSRM extends BasePage {
   model = model;
   moren = '请选择检验节点';
   moren3 = '请选择不良分类';
+  moren4 = '请选择检验位置';
+  selectList1: any = {};
   list: any = [];
   show = false;
   showselect = false;
@@ -264,6 +279,7 @@ export default class PurchaseWHSRM extends BasePage {
   tagslist: any = [];
   detailsinfo: any = [];
   nodelist: any = '';
+  nodelist1: any = '';
   detaillistceshi: any = [];
   detaillistdefects: any = [];
   clickitem: any = '';
@@ -320,7 +336,9 @@ export default class PurchaseWHSRM extends BasePage {
   }
   async getselectlist() {
     await this.model.getCheckType();
+    await this.model.getcheckLocList();
     this.nodelist = this.model.orderNoItemList;
+    this.nodelist1 = this.model.orderNoItemList1;
   }
   async onPass(item) {
     console.log('1234567', item);
@@ -383,6 +401,7 @@ export default class PurchaseWHSRM extends BasePage {
       checkManCode: session.userName,
       checkStatus: '1,2',
       checkType: this.selectList.value,
+      checkLoc: this.selectList1.value,
     };
     this.getDefectListPDA();
     await this.model.getCheckTaskListall(query);
@@ -393,6 +412,19 @@ export default class PurchaseWHSRM extends BasePage {
     // await this.model.getpalletLocation(params); //参数：成型区2，烘房3
   }
 
+  async selectProductlocCode3(e: any) {
+    this.selectList1 = e.pickerName;
+    let query = {
+      factoryCode: session.PoolName,
+      checkManCode: session.userName,
+      checkStatus: '1,2',
+      checkType: this.selectList.value,
+      checkLoc: this.selectList1.value,
+    };
+    this.getDefectListPDA();
+    await this.model.getCheckTaskListall(query);
+    this.list = this.model.CheckTaskListall;
+  }
   async selectProductlocCode2(index, e: any) {
     console.log(index, e);
     this.defectCodeList = e.pickerName;
@@ -454,6 +486,7 @@ export default class PurchaseWHSRM extends BasePage {
       checkManCode: session.userName,
       checkStatus: '1,2',
       checkType: this.selectList.value,
+      checkLoc: this.selectList1.value,
     };
     await this.model.getCheckTaskListall(query);
   }
diff --git a/src/pages/quality/Records/model.ts b/src/pages/quality/Records/model.ts
index 3593836..87d05cd 100644
--- a/src/pages/quality/Records/model.ts
+++ b/src/pages/quality/Records/model.ts
@@ -61,6 +61,21 @@ export class Records extends VuexModule {
     }));
     return { locList1 };
   }
+  orderNoItemList1: any = [];
+  selectList1: any = [];
+  @MutationAction
+  async getcheckLocList() {
+    const result: any = await http.post(url.lanjuquality.Materialinspection.getcheckLocList, {
+      factoryCode: session.PoolName,
+    });
+    const orderNoItemList1 = result;
+    console.log(result, 'wwwwwww');
+    const selectList1 = result.map((item: any) => ({
+      label: item.defectSubclass,
+      value: item.defectCode,
+    }));
+    return { orderNoItemList1, selectList1 };
+  }
 }
 
 export default getModule(Records);
diff --git a/src/utils/url.ts b/src/utils/url.ts
index 22d9cca..2534949 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -186,6 +186,8 @@ export const url = {
       getBatchList: qianzhuione + '/quality/handCheck/getBatchList',
       // 根据工单获取批次下拉
       getDefectListPDA: qianzhuione + '/quality/handCheck/getDefectListPDA',
+      // 获取检验位置
+      getcheckLocList: qianzhuione + '/quality/handCheck/getCheckLocList',
     },
     // 历史记录
     Records: {