From 60d0181c7ac447d470ad193e14e604e3a70ea171 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Tue, 27 Aug 2024 09:21:33 +0800
Subject: [PATCH] =?UTF-8?q?mes=E8=B4=A8=E9=87=8F=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8Cwms=E6=89=B9=E9=87=8F=E4=B8=8B?=
 =?UTF-8?q?=E7=BA=BF=E5=85=A5=E5=BA=93=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/bad-table/bad-table.vue        | 27 ++++++++-----
 src/pages/login/login/index.vue               |  4 +-
 .../quality/Materialinspection/index.vue      | 38 +++++++++++--------
 src/pages/quality/Materialinspection/model.ts | 15 ++++++++
 .../wms/product/BatchOfflineStorage/index.vue |  2 +-
 src/utils/url.ts                              |  1 +
 6 files changed, 59 insertions(+), 28 deletions(-)

diff --git a/src/components/bad-table/bad-table.vue b/src/components/bad-table/bad-table.vue
index 336e5c7..3c87b95 100644
--- a/src/components/bad-table/bad-table.vue
+++ b/src/components/bad-table/bad-table.vue
@@ -1,24 +1,27 @@
 <template>
   <view class="content">
-    <u-modal v-model="isshow" @cancel="cancel" @confirm="confirm" :show-cancel-button="true" :show-title="false">
+    <u-popup mode="center" width="95%" v-model="isshow">
       <uni-table class="badtable" ref="table" border emptyText="">
         <uni-tr v-for="(item, index) in tagslist" :key="index">
           <uni-td>{{ item.label }}</uni-td>
           <uni-td width="50">
             <u-input v-model="item.numberall" />
           </uni-td>
-          <uni-td style="display: flex">
-            <!-- <uni-data-select
-        v-model="item.defect"
-        :localdata="defectList"
-        @change="selectProductlocCode7($event,item,index)"
-      ></uni-data-select> -->
-            <jPicker style="height: 80rpx" moren="请选择" sureColor="#ff0000" @bindpicker="selectProductlocCode7($event, item, index)" showKey="label" valKey="value" :val="item.defect" :options="item.defectList" />
+          <uni-td>
+            <jPicker moren="请选择缺陷分类" sureColor="#ff0000" @bindpicker="selectProductlocCode7($event, item, index)" showKey="label" valKey="value" :val="item.defect" :options="item.defectList" />
             <!-- <u-icon size="28" name="close" @click="cleardefect(item.defect,index)"></u-icon> -->
           </uni-td>
         </uni-tr>
       </uni-table>
-    </u-modal>
+      <view style="margin-top: 10px; display: flex; justify-content: space-around">
+        <div>
+          <u-button style="width: 100px; height: 35px" size="mini" type="error" @click="cancel">取消</u-button>
+        </div>
+        <div>
+          <u-button style="width: 100px; height: 35px" @click="confirm" size="mini" type="primary">确定</u-button>
+        </div>
+      </view>
+    </u-popup>
   </view>
 </template>
 <script>
@@ -34,6 +37,7 @@ export default {
     return {
       model: model,
       isshow: false,
+      show: false,
       tagslist: [],
       tagslistcopy: [],
       itemindex: '',
@@ -79,6 +83,7 @@ export default {
         }
       });
       this.$emit('bindtypelist', this.tagslist, this.itemindex);
+      this.isshow = false;
     },
     confirm() {
       this.tagslist.forEach((item) => {
@@ -96,8 +101,9 @@ export default {
         //   item.defect = '';
         // }
       });
-      console.log('this.tagslist:', this.tagslist);
+      console.log('this.tagslist------:', this.tagslist);
       this.$emit('bindtypelist', this.tagslist, this.itemindex);
+      this.isshow = false;
     },
     cleardefect(params, index) {
       this.tagslist[index].defect = undefined;
@@ -109,6 +115,7 @@ export default {
 
 <style>
 .content {
+  overflow: auto;
   padding: 20rpx;
   margin: 30rpx;
 }
diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index 6f19be5..4bec8d3 100644
--- a/src/pages/login/login/index.vue
+++ b/src/pages/login/login/index.vue
@@ -142,8 +142,8 @@ export default class LoginPage extends BasePage {
     // console.log('Version////', this.Version);
   }
   ///********版本号修改区域**********
-  //version = '0.0.96'; //正式版本号
-  version = '0.0.10'; //测试版本号
+  version = '0.0.98'; //正式版本号
+  //version = '0.0.11'; //测试版本号
   //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本****************
   //isTest = true;
 
diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue
index 0327444..0fbf7b7 100644
--- a/src/pages/quality/Materialinspection/index.vue
+++ b/src/pages/quality/Materialinspection/index.vue
@@ -218,6 +218,9 @@
                 </u-radio>
               </u-radio-group>
             </u-form-item>
+            <u-form-item label="缺陷分类:">
+              <jPicker sureColor="#ff0000" :moren="moren19" @bindpicker="selectdisqualification" showKey="label" valKey="value" :val="formdata.remarkCode" :options="SJLLdefectList" />
+            </u-form-item>
             <u-form-item label="是否发起oa:">
               <u-radio-group v-model="formdata.startOA">
                 <u-radio v-for="(n, indexn) in listselectoa" :key="indexn" :name="n.type" :disabled="n.disabled">
@@ -229,9 +232,6 @@
               <u-form-item label="不合格描述:">
                 <u-input style="background: #fafafa; border: 1px dashed #e2e2e2; padding: 10px 5px" v-model="formdata.remark" placeholder="" type="textarea" />
               </u-form-item>
-              <!-- <u-form-item label="不良分类:">
-                <jPicker sureColor="#ff0000" :moren="moren19" @bindpicker="selectdisqualification" showKey="label" valKey="value" :val="selectdisqualificationType.value" :options="disqualificationlist" />
-              </u-form-item> -->
             </div>
             <div v-show="formdata.startOA == '1'">
               <u-form-item label="来料类别:">
@@ -267,6 +267,9 @@
                 </u-radio>
               </u-radio-group>
             </u-form-item>
+            <u-form-item v-show="selectList.value == 'checkTypeSC'" label="缺陷分类:">
+              <jPicker sureColor="#ff0000" :moren="moren19" @bindpicker="selectdisqualification" showKey="label" valKey="value" :val="formdata.remarkCode" :options="SJLLdefectList" />
+            </u-form-item>
             <u-form-item label="是否发起oa:">
               <u-radio-group v-model="formdata.startOA">
                 <u-radio v-for="(n, indexn) in listselectoa" :key="indexn" :name="n.type" :disabled="n.disabled">
@@ -278,9 +281,6 @@
               <u-form-item label="不合格描述:">
                 <u-input style="background: #fafafa; border: 1px dashed #e2e2e2; padding: 10px 5px" v-model="formdata.remark" placeholder="" type="textarea" />
               </u-form-item>
-              <!-- <u-form-item label="不良分类:">
-                <jPicker sureColor="#ff0000" :moren="moren19" @bindpicker="selectdisqualification" showKey="label" valKey="value" :val="selectdisqualificationType.value" :options="disqualificationlist" />
-              </u-form-item> -->
             </div>
             <div v-show="formdata.startOA == '1'">
               <u-form-item label="生产数量:">
@@ -428,7 +428,7 @@ export default class PurchaseWHSRM extends BasePage {
   moren16 = '请选择是否需要主管审核';
   moren17 = '请选择质量主管';
   moren18 = '请选择所属车间';
-  moren19 = '请选择不合格描述';
+  moren19 = '请选择缺陷分类';
   list: any = [];
   locList6: any = [];
   show = false;
@@ -518,6 +518,7 @@ export default class PurchaseWHSRM extends BasePage {
   CQList: any = [];
   SSCJlist: any = [];
   disqualificationlist: any = [];
+  SJLLdefectList: any = [];
   clickitem: any = '';
   formdata: any = {
     sampleQuality: null,
@@ -709,8 +710,15 @@ export default class PurchaseWHSRM extends BasePage {
       //dictLable:不良描述中文
       remark: this.selectList.value,
     };
+    //首见，来料底部缺陷分类
+    if (this.selectList.value == 'checkTypeSC' || this.selectList.value == 'checkTypeLL') {
+      await this.model.getSJLLdefect(this.selectList.value);
+      this.SJLLdefectList = this.model.SJLLdefectList;
+    }
+
     await this.model.getdisqualification(disqualificationparams);
     this.disqualificationlist = this.model.disqualificationlist;
+
     //await this.model.getOaUserIdlist();
     //this.sqrlist = model.sqrlist;
 
@@ -1049,10 +1057,10 @@ export default class PurchaseWHSRM extends BasePage {
     this.selectZLType = e.pickerName;
     this.formdata.pgzr = this.selectZLType.value;
   }
-  // async selectdisqualification(e: any) {
-  //   this.selectdisqualificationType = e.pickerName;
-  //   this.formdata.remarkCode = this.selectdisqualificationType.value;
-  // }
+  async selectdisqualification(e: any) {
+    this.selectdisqualificationType = e.pickerName;
+    this.formdata.remarkCode = this.selectdisqualificationType.value;
+  }
 
   focustype(item, value, index) {
     //console.log('什么呀这是。。。。',item,value,index);
@@ -1387,7 +1395,7 @@ export default class PurchaseWHSRM extends BasePage {
         // 最终判定结果
         checkResult: this.formdata.checkResult,
         // 不良分类
-        remarkCode: null,
+        remarkCode: this.formdata.remarkCode || null,
         //不合格描述
         remark: this.formdata.remark,
         // 来料类别
@@ -1459,7 +1467,7 @@ export default class PurchaseWHSRM extends BasePage {
         // 最终判定结果
         checkResult: this.formdata.checkResult,
         // 不良分类
-        remarkCode: null,
+        remarkCode: this.formdata.remarkCode || null,
         //不合格描述
         remark: this.formdata.remark,
         // 来料类别
@@ -1515,7 +1523,7 @@ export default class PurchaseWHSRM extends BasePage {
         // 最终判定结果
         checkResult: this.formdata.checkResult,
         // 不良分类
-        remarkCode: null,
+        remarkCode: this.formdata.remarkCode || null,
         //不合格描述
         remark: this.formdata.remark,
         // 来料类别
@@ -1855,7 +1863,7 @@ export default class PurchaseWHSRM extends BasePage {
       // 最终判定结果
       checkResult: this.formdata.checkResult,
       // 不良分类
-      remarkCode: null,
+      remarkCode: this.formdata.remarkCode || null,
       //不合格描述
       remark: this.formdata.remark,
       // 来料类别
diff --git a/src/pages/quality/Materialinspection/model.ts b/src/pages/quality/Materialinspection/model.ts
index 728f345..6cfdf21 100644
--- a/src/pages/quality/Materialinspection/model.ts
+++ b/src/pages/quality/Materialinspection/model.ts
@@ -102,6 +102,21 @@ export class Materialinspection extends VuexModule {
     }));
     return { disqualificationlist };
   }
+  //获取首见，来料底部缺陷分类
+  SJLLdefectList: any = [];
+  @MutationAction
+  async getSJLLdefect(params: any) {
+    const result: any = await http.get(url.lanjuquality.Materialinspection.getSJLLdefect, {
+      params: {
+        checkType: params,
+      },
+    });
+    const SJLLdefectList = result.data.map((item: any) => ({
+      label: item.className,
+      value: item.id,
+    }));
+    return { SJLLdefectList };
+  }
   locList1: any = [];
   getDefectList: any = '';
   @MutationAction
diff --git a/src/pages/wms/product/BatchOfflineStorage/index.vue b/src/pages/wms/product/BatchOfflineStorage/index.vue
index 9c02328..8cbd82d 100644
--- a/src/pages/wms/product/BatchOfflineStorage/index.vue
+++ b/src/pages/wms/product/BatchOfflineStorage/index.vue
@@ -56,7 +56,7 @@
             </view>
             <view class="row-list">
               <view class="list-item"> 托盘号: </view>
-              <view> {{ orderNoItemList && orderNoItemList.batchNumber }} </view>
+              <view> {{ orderNoItemList && orderNoItemList.sn }} </view>
             </view>
             <view class="row-list">
               <view class="row-list-item">
diff --git a/src/utils/url.ts b/src/utils/url.ts
index 347b3cf..68ab122 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -300,6 +300,7 @@ export const url = {
       getdisqualification: qianzhuione + '/system/dict/data/getDictData',
       getClassInfoList: qianzhuione + '/quality/defectClass/getClassInfoList',
       getCheckTaskDetailListCg: qianzhuione + '/quality/handCheck/getCheckTaskDetailListCg',
+      getSJLLdefect: qianzhuione + '/quality/defectClass/getClassInfoListByCheckType',
     },
     // 历史记录
     Records: {