修改了分包数据录入判定按钮

pages/meter-subcontract/MeterSubSampleQuery.vue

@@ -42,7 +42,7 @@
                   <div v-else-if="item.key==='jobOut'">
                      {{scope.row[item.key]===1?'是':'否'}}
                   </div>
-                  <span v-if="item.key==='type'">
+                  <span v-else-if="item.key==='type'">
                       <span v-if="scope.row[item.key]===0">
                           检定
                       </span>

pages/meter-subcontract/subpackage-input/Judge.vue

+<template>
+  <div>
+    <Modal v-model="showBackModal" :mask-closable="false" class="zIndex-1100">
+      <p slot="header">{{modalTitle}}</p>
+      <div>
+        <Form ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="90">
+          <Form-item label="判定结果:" prop="type">
+            <RadioGroup v-model="formObj.singleJudge">
+              <Radio :label="'PASS'">合格</Radio>
+              <Radio :label="'FAIL'">不合格</Radio>
+            </RadioGroup>
+          </Form-item>
+        </Form>
+      </div>
+      <div slot="footer">
+        <ModalFooter ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></ModalFooter>
+      </div>
+    </Modal>
+  </div>
+</template>
+<script>
+/**
+ * 判定
+ */
+import ModalFooter from '../../../components/base/modalFooter'
+import { meterItem } from '../../../api'
+
+export default {
+  components: {
+    ModalFooter
+  },
+  data() {
+    return {
+      ids: [], // 合同ids
+      modalTitle: '判定',
+      showBackModal: false,
+      formObj: {
+        singleJudge: 'PASS'
+      },
+      path: '',
+      ruleValidate: {
+        singleJudge: [
+          {
+            required: true,
+            message: '判定结果不能为空',
+            trigger: 'blur'
+          }
+        ]
+      },
+      footerList: [
+        { id: '', name: '取消', type: '' },
+        { id: '', name: '保存', type: 'primary' }
+      ]
+    }
+  },
+  methods: {
+    _open(ids) {
+      this.ids = ids // 合同id
+      this.showBackModal = true
+      this.formObj.type = 1
+      this.$refs.footerModal._hideLoading()
+    },
+    _cancel() {
+      this.showBackModal = false
+    },
+    _footerResult(name) {
+      switch (name) {
+        case '取消':
+          this._cancel()
+          break
+        case '保存':
+          this._ok()
+          break
+      }
+      this.$refs.footerModal._hideLoading()
+    },
+    _ok() {
+      this.$refs.formObj.validate(valid => {
+        if (valid) {
+          const data = {}
+          data.ids = this.ids.join(',')
+          this.$extend(data, { singleJudge: this.formObj.singleJudge })
+          this._handJudge(data)
+        } else {
+          this.$Message.error('表单验证失败!')
+        }
+      })
+    },
+    _handJudge: async function(data) {
+      const result = await meterItem._handJudge(data)
+      if (result) {
+        this.$Message.success('判定成功!')
+        this.showBackModal = false
+        this.$emit('on-result-change')
+      }
+    }
+  }
+}
+</script>

pages/meter-subcontract/subpackage-input/MeterSubSampleManage.vue

@@ -44,13 +44,13 @@
                   <div v-else-if="item.key==='jobOut'">
                      {{scope.row[item.key]===1?'是':'否'}}
                   </div>
-<!--                  <div v-else-if="item.key==='type'">-->
-<!--                    <Select v-model="scope.row.type">-->
-<!--                      <Option v-for="(item,index) in options" :key="item.name" :value="index">-->
-<!--                        {{ item.name }}-->
-<!--                      </Option>-->
-<!--                    </Select>-->
-<!--                  </div>-->
+                  <div v-else-if="item.key==='type'">
+                    <Select v-model="scope.row.type" disabled>
+                      <Option v-for="(item,index) in options" :key="item.name" :value="index">
+                        {{ item.name }}
+                      </Option>
+                    </Select>
+                  </div>
                   <div v-else>{{scope.row[item.key]}}</div>
                 </template>
               </vxe-table-column>

pages/meter-subcontract/subpackage-input/SubResultInputEdit.vue

@@ -64,12 +64,15 @@
         </Row>
       </div>
     </Modal>
+    <SubInputJudeg ref="judge" @on-result-change="_page"></SubInputJudeg>
   </div>
 </template>
 <script>
 import { meterItem } from '../../../api'
+import SubInputJudeg from './Judge'
 export default {
   components: {
+    SubInputJudeg
     // FoodSampleGovernDetail,
     // CopyModal,
     // FoodSampleGovernLYEdits
@@ -176,6 +179,9 @@ export default {
           case '完成':
             this._testEnd()
             break
+          case '判定':
+            this._judge()
+            break
           case '导入检测项目':
             this._importItem()
             break
@@ -238,7 +244,13 @@ export default {
       this.showModal = true
       this._page()
     },
-
+    _judge() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条数据！')
+      } else {
+        this.$refs.judge._open(this.selectIds)
+      }
+    },
     _testEnd() {
       if (this.selectIds.length === 0) {
         this.$Message.success('请选择完成检测的项目')