责任人验证

src/api/inspectionProjectTask/index.js

@@ -67,3 +67,11 @@ export async function getById(id) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+// 检查是否责任人
+export async function verificationQualityInspector(id) {
+  const res = await request.post(
+    `/qms/taskmonad/verificationQualityInspector/${id}`
+  );
+  return res.data.code;
+}

src/views/inspectionProjectTask/index.vue

@@ -67,7 +67,8 @@
   import {
     getList,
     sampleCollection,
-    getById
+    getById,
+    verificationQualityInspector
   } from '@/api/inspectionProjectTask';
   import dictMixins from '@/mixins/dictMixins';
   export default {
@@ -284,17 +285,25 @@
         this.$refs.table.reload({ page: 1, where: where });
       },
 
-      sampleCollection(row) {
+      async sampleCollection(row) {
+        const code = await verificationQualityInspector(row.id);
+        if (code == '-1') {
+          return;
+        }
         sampleCollection({ id: row.id }).then((res) => {
           this.$message.success('收样成功');
-
           this.reload();
         });
       },
       /* 报工 */
       async report(row, type) {
+        if (type != 'detail') {
+          const code = await verificationQualityInspector(row.id);
+          if (code == '-1') {
+            return;
+          }
+        }
         const res = await getById(row.id);
-
         this.$refs.inspectionProjectReportRef.open(
           { workData: res.data, list: res.data.templateList },
           type,

src/views/inspectionWork/edit.vue

@@ -1549,6 +1549,7 @@
         this.$refs.baseInfoRefs.$refs.form1.validate((valid) => {
           if (!valid) return false;
           //单样全部
+          console.log(this.form.recordingMethod,'this.form.recordingMethod')
           if (this.form.recordingMethod == 2) {
             if (this.qualityType == 2 && this.isReportProcessProduce) {
               for (let i = 0; i < this.sampleList.length; i++) {

src/views/sample/sampleRecord/components/addSample.vue

@@ -257,7 +257,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="10" v-if="form.conditionType == 1">
-              <el-form-item prop="unit" label="单位">
+              <el-form-item prop="packingUnit" label="单位">
                 <el-select
                   v-model="form.packingUnit"
                   placeholder="请选择"
@@ -400,7 +400,8 @@
           ],
           quantity: [{ required: true, message: '请输入', trigger: 'change' }],
           portion: [{ required: true, message: '请输入', trigger: 'change' }],
-          unit: [{ required: true, message: '请选择', trigger: 'change' }]
+          unit: [{ required: true, message: '请选择', trigger: 'change' }],
+          packingUnit: [{ required: true, message: '请选择', trigger: 'change' }],
         },
         sampleQuantityList: [
           { label: '批样', value: 1 },

src/views/unqualifiedProduct/unqualifiedList/components/create.vue

@@ -103,11 +103,11 @@
         <!--        <el-table-column label="规格" align="center" prop="specification">-->
         <!--        </el-table-column>-->
 
-        <el-table-column label="数量" align="center" prop="unqualifiedQuantity">
+        <el-table-column label="数量" align="center" prop="measureQuantity">
           <template slot-scope="scope">
             <el-form-item
               label-width="0px"
-              :prop="'poList.' + scope.$index + '.unqualifiedQuantity'"
+              :prop="'poList.' + scope.$index + '.measureQuantity'"
               :rules="[
                 {
                   required: true,
@@ -118,13 +118,11 @@
               ]"
             >
               <el-input
-                v-model.number="scope.row.unqualifiedQuantity"
+                v-model.number="scope.row.measureQuantity"
                 size="small"
                 style="width: 100%"
                 placeholder="输入数量"
-                @input="
-                  scope.row.measureQuantity = scope.row.unqualifiedQuantity
-                "
+              
               ></el-input>
             </el-form-item>
           </template>
@@ -588,7 +586,7 @@
           }
 
           if (this.title == '修改') {
-            updateData({ ...this.form, id: this.id })
+            updateData({ ...this.form })
               .then((res) => {
                 this.loading = false;
                 this.$message.success('成功');