0.0.52质量管理检验 检验标准自动获取

src/pages/quality/Materialinspection/index.vue

@@ -115,19 +115,21 @@
                 </u-radio-group>
               </div>
             </div>
-            <div class="item1" style="color: #000; position: relative">
-              <!-- <div class="item1">检查结果: {{ item.itemMethod }}</div> -->
-              <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)" type="text" name="" id="" />
                 单位:mm
               </div>
+              <view v-if="item.weight == '1'" @click.stop="WeightInfo(item)" class="boder-icon-rigth1"> 自动获取 </view>
             </div>
+            <div class="item1" style="color: #000; position: relative">
+              <!-- <div class="item1">检查结果: {{ item.itemMethod }}</div> -->
+              <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 item3" v-if="item.propertyCode == '1'">
               <div>检查结果:</div>
               <div class="select">
@@ -179,6 +181,33 @@
             <u-input :disabled="item.noOkQuality == null ? true : true" v-model="item.noOkQuality" placeholder="" type="number" />
           </u-form-item>
 
+          <div class="" v-show="selectList.value == 'checkTypeLL'">
+            <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">
+                  {{ n.name }}
+                </u-radio>
+              </u-radio-group>
+            </u-form-item>
+            <u-form-item label="最终判定:">
+              <!-- <u-input v-model="formdata.checkResult" placeholder="" type="text" /> -->
+              <u-radio-group v-model="formdata.checkResult">
+                <u-radio v-for="(n, indexn) in listselectdetermine" :key="indexn" :name="n.type" :disabled="n.disabled">
+                  {{ n.name }}
+                </u-radio>
+              </u-radio-group>
+            </u-form-item>
+            <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="moren5" @bindpicker="selectProductlocCode4" showKey="label" valKey="value" :val="selectmaterialType.value" :options="model.locList2" />
+            </u-form-item>
+            <u-form-item label="物料来源:">
+              <jPicker sureColor="#ff0000" :moren="moren6" @bindpicker="selectProductlocCode5" showKey="label" valKey="value" :val="selectmaterialFromList.value" :options="model.locList3" />
+            </u-form-item>
+          </div>
+
           <!-- <u-form-item v-if="isshow1" label="不合格数量:">
             <u-input v-model="formdata.noOkQuality" placeholder="" type="number" />
           </u-form-item>
@@ -203,7 +232,7 @@
       </u-popup>
       <view v-if="show" class="mask"></view>
     </view>
-    <u-select v-model="showselect" mode="mutil-column-auto" :list="selectlist"></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)" />
@@ -242,6 +271,8 @@ export default class PurchaseWHSRM extends BasePage {
   moren2 = '请选择批次号';
   moren3 = '请选择不良分类';
   moren4 = '请选择检验位置';
+  moren5 = '请选择来料类别';
+  moren6 = '请选择物料来源';
   list: any = [];
   show = false;
   showselect = false;
@@ -261,6 +292,30 @@ export default class PurchaseWHSRM extends BasePage {
       radiovalue: null,
     },
   ];
+  listselectoa: any = [
+    {
+      type: 1,
+      name: '是',
+      radiovalue: null,
+    },
+    {
+      type: 0,
+      name: '否',
+      radiovalue: null,
+    },
+  ];
+  listselectdetermine: any = [
+    {
+      type: 'Y',
+      name: '合格',
+      radiovalue: null,
+    },
+    {
+      type: 'N',
+      name: '不合格',
+      radiovalue: null,
+    },
+  ];
   selectList: any = {};
   selectList1: any = {};
   defectCodeList: any = {};
@@ -273,58 +328,8 @@ export default class PurchaseWHSRM extends BasePage {
   //   this.remove = e.pickerName;
   // }
   orderNo: any = '';
-  selectlist: any = [
+  // 自动取数
-    {
+  WeightInfolist: any = [];
-      value: 1,
-      label: '中国',
-      children: [
-        {
-          value: 2,
-          label: '广东',
-          children: [
-            {
-              value: 3,
-              label: '深圳',
-            },
-            {
-              value: 4,
-              label: '广州',
-            },
-          ],
-        },
-        {
-          value: 5,
-          label: '广西',
-          children: [
-            {
-              value: 6,
-              label: '南宁',
-            },
-            {
-              value: 7,
-              label: '桂林',
-            },
-          ],
-        },
-      ],
-    },
-    {
-      value: 8,
-      label: '美国',
-      children: [
-        {
-          value: 9,
-          label: '纽约',
-          children: [
-            {
-              value: 10,
-              label: '皇后街区',
-            },
-          ],
-        },
-      ],
-    },
-  ];
   detailList: any = [];
   equipmentindex: any = [];
   tagsvalue: any = '';
@@ -341,6 +346,11 @@ export default class PurchaseWHSRM extends BasePage {
     aNoOkquality: null,
     bNoOkquality: null,
     cNoOkquality: null,
+    checkResult: null,
+    materialType: null,
+    materialFrom: null,
+    remark: null,
+    startOA: null,
   };
   isvalue = false;
   isvalue2 = false;
@@ -357,6 +367,12 @@ export default class PurchaseWHSRM extends BasePage {
   imgurl: any = 'http://lj08.cn/21001871815240307020600048115350';
   // 不良类型
   isshowtype = false;
+  // 来料类别
+  getmaterialType: any = [];
+  selectmaterialType: any = {};
+  // 物料来源
+  getmaterialFromList: any = [];
+  selectmaterialFromList: any = {};
   // 引入原生插件
   // 调用插件的 mpaasScan 方法
 
@@ -364,6 +380,7 @@ export default class PurchaseWHSRM extends BasePage {
   tagClick(index) {
     this.tagslist.splice(index, 1);
   }
+  // 标准输入
   ontagsadd() {
     if (this.tagsvalue == '' || this.tagsvalue == undefined) {
       // this.customToast('请扫码设备编码');
@@ -379,7 +396,15 @@ export default class PurchaseWHSRM extends BasePage {
     //   this.isfocus = true;
     // });
   }
+  // 页面加载
   async onLoad(options) {
+    uni.$on('scanCodeData', (data) => {
+      let str = `${data.code}`;
+      let recData = JSON.parse(str);
+      console.log(recData);
+      this.scanCodeOne2;
+      // 现在你可以使用 recData 进行进一步的处理
+    });
     this.getselectlist();
     if (options.listitem) {
       let str = decodeURIComponent(options.listitem);
@@ -399,6 +424,7 @@ export default class PurchaseWHSRM extends BasePage {
       }
     }
   }
+  // 获取下拉
   async getselectlist() {
     await this.model.getCheckType();
     await this.model.getcheckLocList();
@@ -421,12 +447,40 @@ export default class PurchaseWHSRM extends BasePage {
       this.defectCodelist.push(a);
     });
   }
+  async getmaterialTypePDA() {
+    await this.model.getmaterialTypePDA();
+    this.getmaterialType = this.model.locList2;
+  }
+  // 自动取数
+  async WeightInfo(item) {
+    let query = {
+      factoryCode: session.PoolName,
+      recordId: item.recordId,
+    };
+    await this.model.getWeightInfo(query);
+    // let actualValue = '["111","111"]'
+    // item.actualValue = actualValue
+    this.WeightInfolist = this.model.WeightInfoList;
+    if (this.WeightInfolist.msg) {
+      item.actualValue = this.WeightInfolist.msg;
+    }
+  }
+  async getmaterialFromListPDA() {
+    await this.model.getmaterialFromListPDA();
+    this.getmaterialFromList = this.model.locList3;
+  }
   async onPass(item) {
     this.clickitem = item;
     let query1 = {
       factoryCode: session.PoolName,
       workorderCode: this.clickitem.orderNo,
     };
+    this.getDefectListPDA();
+    this.getmaterialFromListPDA();
+    this.getmaterialTypePDA();
+    if (this.selectList.value == 'checkTypeLL') {
+      this.formdata.startOA = 1;
+    }
     await this.model.getBatchList(query1);
     let labelname = this.selectList.value;
     if (labelname == 'checkTypeSCXJ') {
@@ -466,10 +520,27 @@ export default class PurchaseWHSRM extends BasePage {
       item.babtype = this.defectCodelist;
       item.defectlabel = null;
     });
+    this.determine();
+    // if (this.detaillistceshi.some((item) => item.status === 'Y')) {
+    //   this.formdata.checkResult = '合格'
+    // }
+    // if (this.detaillistceshi.some((item) => item.status === 'N')) {
+    //   this.formdata.checkResult = '不合格'
+    // }
     this.show = true;
   }
+  // 最终判定是否合格
+  determine() {
+    if (this.detaillistceshi.some((item) => item.status === 'Y')) {
+      this.formdata.checkResult = 'Y';
+    }
+    if (this.detaillistceshi.some((item) => item.status === 'N')) {
+      this.formdata.checkResult = 'N';
+    }
+  }
   radioGroupChange(item, value, index) {
-    console.log(item, value, index);
+    console.log(item, value, index, '切换单选框');
+    this.determine();
   }
   radioChange(e) {
     console.log(e);
@@ -553,6 +624,14 @@ export default class PurchaseWHSRM extends BasePage {
     await this.model.getCheckTaskListall(query);
     this.list = this.model.CheckTaskListall;
   }
+  async selectProductlocCode4(e: any) {
+    this.selectmaterialType = e.pickerName;
+    this.formdata.materialType = this.selectmaterialType.value;
+  }
+  async selectProductlocCode5(e: any) {
+    this.selectmaterialFromList = e.pickerName;
+    this.formdata.materialFrom = this.selectmaterialFromList.value;
+  }
   focustype(item, value, index) {
     this.isfocus = false;
     this.$nextTick(() => {
@@ -580,15 +659,6 @@ export default class PurchaseWHSRM extends BasePage {
     this.show = false;
     this.form3.barCodewl = '';
   }
-  onblur() {
-    this.showselect = true;
-  }
-  onfocus() {
-    this.showselect = false;
-  }
-  onclick() {
-    this.showselect = true;
-  }
   async getlist() {
     let query = {
       factoryCode: session.PoolName,
@@ -665,6 +735,32 @@ export default class PurchaseWHSRM extends BasePage {
       });
       return;
     }
+    if (this.formdata.checkResult == 'N') {
+      if (this.formdata.remark === null || this.formdata.remark === '') {
+        (this.$refs.uToast as any).show({
+          title: '不合格描述不能为空',
+          type: 'default',
+        });
+        return;
+      }
+    }
+    if (this.selectList.value == 'checkTypeLL') {
+      if (this.formdata.materialType === null || this.formdata.materialType === '') {
+        (this.$refs.uToast as any).show({
+          title: '请选择来料类别',
+          type: 'default',
+        });
+        return;
+      }
+      if (this.formdata.materialFrom === null || this.formdata.materialFrom === '') {
+        (this.$refs.uToast as any).show({
+          title: '请选择物料来源',
+          type: 'default',
+        });
+        return;
+      }
+    }
+
     // if (this.isquality) {
     //   (this.$refs.uToast as any).show({
     //     title: '数量不能为空',
@@ -720,9 +816,34 @@ export default class PurchaseWHSRM extends BasePage {
       workorderCodeSap: this.clickitem.workorderCodeSap,
       qcCheckTaskDetails: this.detaillistceshi,
       defects: this.detaillistdefects,
+      // 检验编码
+      checkNo: this.clickitem.checkNo,
+      // 批次编码
       incomeBatchNo: incomeBatchNo,
+      //物料编号
+      materialCode: this.clickitem.materialCode,
+      // 物料名称
+      materialName: this.clickitem.materialName,
+      // 供应商编码
+      supplierCode: this.clickitem.supplierCode,
+      // 供应商名称
+      supplierName: this.clickitem.supplierName,
+      // 来料数量
+      quality: this.clickitem.quality,
+      // 单位
+      unit: this.clickitem.unit,
+      //是否发起oa
+      startOA: this.formdata.startOA,
+      // 最终判定结果
+      checkResult: this.formdata.checkResult,
+      // 不合格措述
+      remark: this.formdata.remark,
+      // 来料类别
+      materialType: this.formdata.materialType,
+      // 物料来源
+      materialFrom: this.formdata.materialFrom,
     };
-    console.log(query);
+    console.log(query, this.formdata);
     await this.model.commitCheckTaskList(query);
     if (this.model.SubmitCode.code == '200') {
       (this.$refs.uToast as any).show({
@@ -890,6 +1011,15 @@ export default class PurchaseWHSRM extends BasePage {
 }
 </script>
 <style lang="scss" scoped>
+.boder-icon-rigth1 {
+  border: 1rpx solid #5a9cf8;
+  width: 200rpx;
+  text-align: center;
+  background: #5a9cf8;
+  color: #ffffff;
+  margin-top: 5px;
+  padding: 5px;
+}
 .page-product-receipt {
   background: #f2f2f2 linear-gradient(0deg, #f2f2f2 0%, #f8262c 51%, #d9001b 100%) no-repeat;
   background-size: 100% 600rpx;

src/pages/quality/Materialinspection/model.ts

@@ -97,6 +97,52 @@ export class Materialinspection extends VuexModule {
     }));
     return { orderNoItemList1, selectList1 };
   }
+  locList2: any = [];
+  materialtypeList: any = '';
+  @MutationAction
+  async getmaterialTypePDA() {
+    const result: any = await http.get(url.lanjuquality.Materialinspection.getDictData, {
+      //loginName: session.loginName,
+      params: {
+        dictType: 'material_type_oa',
+      },
+    });
+    console.log(result);
+    const materialtypeList: [] = result;
+    const locList2 = materialtypeList.map((item: any) => ({
+      label: item.ymdTypeName,
+      value: item.ymdType,
+    }));
+    return { locList2 };
+  }
+  locList3: any = [];
+  materialFromList: any = '';
+  @MutationAction
+  async getmaterialFromListPDA() {
+    const result: any = await http.get(url.lanjuquality.Materialinspection.getDictData, {
+      //loginName: session.loginName,
+      params: {
+        dictType: 'material_from_oa',
+      },
+    });
+    console.log(result);
+    const materialFromList: [] = result;
+    const locList3 = materialFromList.map((item: any) => ({
+      label: item.ymdTypeName,
+      value: item.ymdType,
+    }));
+    return { locList3 };
+  }
+  WeightInfoList: any = [];
+  @MutationAction
+  async getWeightInfo(query: any) {
+    const result: any = await http.get(url.lanjuquality.Materialinspection.getWeightInfo, {
+      //loginName: session.loginName,
+      params: query,
+    });
+    const WeightInfoList = result;
+    return { WeightInfoList };
+  }
 }
 
 export default getModule(Materialinspection);

src/pages/quality/Records/index.vue

@@ -138,6 +138,32 @@
           <u-form-item :label="item.defectSubclass" v-for="(item, index) in detaillistdefects" :key="index">
             <u-input v-model="item.noOkQuality" :disabled="item.noOkQuality == null ? true : true" placeholder="" type="number" />
           </u-form-item>
+          <div class="" v-show="selectList.value == 'checkTypeLL'">
+            <u-form-item label="最终判定:">
+              <!-- <u-input v-model="formdata.checkResult" placeholder="" type="text" /> -->
+              <u-radio-group v-model="clickitem.checkResult">
+                <u-radio v-for="(n, indexn) in listselectdetermine" :disabled="clickitem.checkResult == n.type ? false : true" :key="indexn" :name="n.type">
+                  {{ n.name }}
+                </u-radio>
+              </u-radio-group>
+            </u-form-item>
+            <u-form-item label="不合格描述:">
+              <u-input :disabled="model.CheckTaskList.remark == null ? true : true" style="background: #fafafa; border: 1px dashed #e2e2e2; padding: 10px 5px" v-model="model.CheckTaskList.remark" placeholder="" type="textarea" />
+            </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">
+                  {{ n.name }}
+                </u-radio>
+              </u-radio-group>
+            </u-form-item>
+            <u-form-item label="来料类别:">
+              <jPicker sureColor="#ff0000" :moren="moren5" @bindpicker="selectProductlocCode4" showKey="label" valKey="value" :val="selectmaterialType.value" :options="model.locList2" />
+            </u-form-item>
+            <u-form-item label="物料来源:">
+              <jPicker sureColor="#ff0000" :moren="moren6" @bindpicker="selectProductlocCode5" showKey="label" valKey="value" :val="selectmaterialFromList.value" :options="model.locList3" />
+            </u-form-item>
+          </div>
           <!-- <u-form-item v-if="isshow1" label="不合格数量:">
             <u-input v-model="clickitem.noOkQuality" :disabled="clickitem.noOkQuality == null ? true : true" placeholder="" type="number" />
           </u-form-item>
@@ -191,6 +217,8 @@ export default class PurchaseWHSRM extends BasePage {
   moren = '请选择检验节点';
   moren3 = '请选择不良分类';
   moren4 = '请选择检验位置';
+  moren5 = '请选择来料类别';
+  moren6 = '请选择物料来源';
   selectList1: any = {};
   list: any = [];
   show = false;
@@ -296,6 +324,36 @@ export default class PurchaseWHSRM extends BasePage {
   isshow1 = false;
   isshow2 = false;
   isshow3 = false;
+  listselectoa: any = [
+    {
+      type: 1,
+      name: '是',
+      radiovalue: null,
+    },
+    {
+      type: 0,
+      name: '否',
+      radiovalue: null,
+    },
+  ];
+  listselectdetermine: any = [
+    {
+      type: 'Y',
+      name: '合格',
+      radiovalue: null,
+    },
+    {
+      type: 'N',
+      name: '不合格',
+      radiovalue: null,
+    },
+  ];
+  // 来料类别
+  getmaterialType: any = [];
+  selectmaterialType: any = {};
+  // 物料来源
+  getmaterialFromList: any = [];
+  selectmaterialFromList: any = {};
   //收货按钮
   tagClick(index) {
     this.tagslist.splice(index, 1);
@@ -340,10 +398,31 @@ export default class PurchaseWHSRM extends BasePage {
     this.nodelist = this.model.orderNoItemList;
     this.nodelist1 = this.model.orderNoItemList1;
   }
+  async selectProductlocCode4(e: any) {
+    this.selectmaterialType = e.pickerName;
+    this.formdata.materialType = this.selectmaterialType.value;
+  }
+  async selectProductlocCode5(e: any) {
+    this.selectmaterialFromList = e.pickerName;
+    this.formdata.materialFrom = this.selectmaterialFromList.value;
+  }
+  async getmaterialTypePDA() {
+    await this.model.getmaterialTypePDA();
+    this.getmaterialType = this.model.locList2;
+  }
+  async getmaterialFromListPDA() {
+    await this.model.getmaterialFromListPDA();
+    this.getmaterialFromList = this.model.locList3;
+  }
   async onPass(item) {
     console.log('1234567', item);
     this.clickitem = item;
     let labelname = null;
+    this.getmaterialFromListPDA();
+    this.getmaterialTypePDA();
+    this.selectmaterialType.value = this.clickitem.materialType;
+    this.selectmaterialFromList.value = this.clickitem.materialFrom;
+    console.log(this.clickitem.remark, '222222');
     this.nodelist.forEach((item) => {
       if (item.orderCode == this.selectList.value) {
         labelname = item.checkName;

src/pages/quality/Records/model.ts

@@ -76,6 +76,42 @@ export class Records extends VuexModule {
     }));
     return { orderNoItemList1, selectList1 };
   }
+  locList2: any = [];
+  materialtypeList: any = '';
+  @MutationAction
+  async getmaterialTypePDA() {
+    const result: any = await http.get(url.lanjuquality.Materialinspection.getDictData, {
+      //loginName: session.loginName,
+      params: {
+        dictType: 'material_type_oa',
+      },
+    });
+    console.log(result);
+    const materialtypeList: [] = result;
+    const locList2 = materialtypeList.map((item: any) => ({
+      label: item.ymdTypeName,
+      value: item.ymdType,
+    }));
+    return { locList2 };
+  }
+  locList3: any = [];
+  materialFromList: any = '';
+  @MutationAction
+  async getmaterialFromListPDA() {
+    const result: any = await http.get(url.lanjuquality.Materialinspection.getDictData, {
+      //loginName: session.loginName,
+      params: {
+        dictType: 'material_from_oa',
+      },
+    });
+    console.log(result);
+    const materialFromList: [] = result;
+    const locList3 = materialFromList.map((item: any) => ({
+      label: item.ymdTypeName,
+      value: item.ymdType,
+    }));
+    return { locList3 };
+  }
 }
 
 export default getModule(Records);

src/pages/shouye/me.vue

@@ -66,7 +66,7 @@ export default class RawHome extends BasePage {
   model = model;
   src: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg';
   today = dayjs().format('YYYY-MM-DD dddd');
-  version = '0.0.51';
+  version = '0.0.52';
   checkversion: any = {};
   sessiondata: any = '';
   onLoad() {

src/utils/url.ts

@@ -227,6 +227,10 @@ export const url = {
       getDefectListPDA: qianzhuione + '/quality/handCheck/getDefectListPDA',
       // 获取检验位置
       getcheckLocList: qianzhuione + '/quality/handCheck/getCheckLocList',
+      //字典表
+      getDictData: qianzhuione + '/quality/qcInterface/getDictData',
+      // 自动取数
+      getWeightInfo: qianzhuione + '/quality/handCheck/getWeightInfo',
     },
     // 历史记录
     Records: {