From 682651bd0d6e2e1477e5119c4e1154503262fb17 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 12 十月 2023 13:03:26 +0800
Subject: [PATCH] 1.检验项设置、质检方案、工序检验、检验记录 100%

---
 src/views/qualityManager/processCheckItem.vue   |  406 +++++++
 src/views/qualityManager/processCheck.vue       |  802 ++++++++++++++
 src/api/QualityManagement.js                    |  143 ++
 src/views/qualityManager/qualityPlaning.vue     | 1292 ++++++++++++++++++++++
 src/views/qualityManager/processCheckRecord.vue |  732 ++++++++++++
 5 files changed, 3,365 insertions(+), 10 deletions(-)

diff --git a/src/api/QualityManagement.js b/src/api/QualityManagement.js
index 8cbbf5d..48d5970 100644
--- a/src/api/QualityManagement.js
+++ b/src/api/QualityManagement.js
@@ -26,3 +26,146 @@
     params: data
   })
 }
+
+// 宸ュ簭妫�楠岄」鐩垪琛ㄦ煡璇�
+export function StepCheckItemSearch(data) {
+  return request({
+    url: 'QualityManagement/StepCheckItemSearch',
+    method: 'get',
+    params: data
+  })
+}
+
+// 宸ュ簭妫�楠岄」鐩柊澧炪�佺紪杈戞彁浜�
+export function AddUpdateStepCheckItem(data) {
+  return request({
+    url: 'QualityManagement/AddUpdateStepCheckItem',
+    method: 'post',
+    data
+  })
+}
+
+// 宸ュ簭妫�楠岄」鐩垹闄�
+export function DeleteStepCheckItem(data) {
+  return request({
+    url: 'QualityManagement/DeleteStepCheckItem',
+    method: 'post',
+    params: data
+  })
+}
+
+// 宸ュ簭妫�楠屾爣鍑嗗垹闄�
+export function DeleteStepCheckStaned(data) {
+  return request({
+    url: 'QualityManagement/DeleteStepCheckStaned',
+    method: 'post',
+    params: data
+  })
+}
+
+// 鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾壂鐮佽幏鍙栦换鍔′俊鎭�
+export function MesOrderStepCheckSearch(data) {
+  return request({
+    url: 'QualityManagement/MesOrderStepCheckSearch',
+    method: 'get',
+    params: data
+  })
+}
+
+// 鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠岃幏鍙栨楠屾爣鍑嗕笅鎷夋鏁版嵁
+export function MesOrderStepCheckSelect() {
+  return request({
+    url: 'QualityManagement/MesOrderStepCheckSelect',
+    method: 'get'
+  })
+}
+
+// 鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾牴鎹楠屾爣鍑嗚幏鍙栨楠岄」鐩垪琛�
+export function MesOrderStepCheckItemList(data) {
+  return request({
+    url: 'QualityManagement/MesOrderStepCheckItemList',
+    method: 'get',
+    params: data
+  })
+}
+
+// 鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾彁浜や繚瀛�
+export function SaveMesOrderStepCheckItem(data) {
+  return request({
+    url: 'QualityManagement/SaveMesOrderStepCheckItem',
+    method: 'post',
+    data
+  })
+}
+
+// 宸ュ簭妫�楠岃褰曞垪琛ㄦ煡璇�
+export function StepCheckTableSearch(data) {
+  return request({
+    url: 'QualityManagement/StepCheckTableSearch',
+    method: 'get',
+    params: data
+  })
+}
+
+// 宸ュ簭妫�楠岃褰曞垪琛ㄦ煡璇�
+export function StepCheckTableSubSearch(data) {
+  return request({
+    url: 'QualityManagement/StepCheckTableSubSearch',
+    method: 'get',
+    params: data
+  })
+}
+
+// 宸ュ簭妫�楠岃褰曞鍑�
+export function StepCheckTableOutExcel(data) {
+  return request({
+    url: 'QualityManagement/StepCheckTableOutExcel',
+    method: 'get',
+    params: data
+  })
+}
+
+// 璐ㄦ鏂规鍒楄〃鏌ヨ
+export function QualityInspectionSearch(data) {
+  return request({
+    url: 'QualityManagement/QualityInspectionSearch',
+    method: 'get',
+    params: data
+  })
+}
+
+// 璐ㄦ鏂规鏌ョ湅缂栬緫
+export function QualityInspectionSeeEdit(data) {
+  return request({
+    url: 'QualityManagement/QualityInspectionSeeEdit',
+    method: 'get',
+    params: data
+  })
+}
+
+// 璐ㄦ鏂规鏂板/缂栬緫鎻愪氦
+export function QualityInspectionAddEditSave(data) {
+  return request({
+    url: 'QualityManagement/QualityInspectionAddEditSave',
+    method: 'post',
+    data
+  })
+}
+
+// 璐ㄦ鏂规鍒犻櫎
+export function QualityInspectionDelete(data) {
+  return request({
+    url: 'QualityManagement/QualityInspectionDelete',
+    method: 'post',
+    params: data
+  })
+}
+
+// 宸ュ簭妫�楠屾爣鍑嗘柊澧炪�佺紪杈戣幏鍙栨楠岄」鐩笅鎷夊垪琛�
+export function QualityStepCheckItemSelect() {
+  return request({
+    url: 'QualityManagement/QualityStepCheckItemSelect',
+    method: 'get'
+  })
+}
+
diff --git a/src/views/qualityManager/processCheck.vue b/src/views/qualityManager/processCheck.vue
index e69de29..860bacd 100644
--- a/src/views/qualityManager/processCheck.vue
+++ b/src/views/qualityManager/processCheck.vue
@@ -0,0 +1,802 @@
+<template>
+  <div>
+    <div class="body" :style="{height:mainHeight+'px'}" style="background-color: #eaecef">
+
+      <div
+        style="background-color: #f8f8fa;margin: 10px 0;
+         overflow-y:auto;overflow-x: hidden;
+        display: flex;flex-direction: column"
+        :style="{height:mainHeight+'px'}"
+      >
+        <div class="content1">
+          <div>
+            <i class="el-icon-s-operation" style="font-size: 14px" :style="{color:$store.state.settings.theme}" />
+          </div>
+          <div class="title">
+            鎵弿淇℃伅
+          </div>
+        </div>
+
+        <div class="content2">
+          <el-form :inline="true" label-width="80px">
+            <el-form-item label="妫�楠岀被鍨�">
+              <el-select
+                v-model="form.checktype"
+                style="width: 160px;"
+                placeholder="璇烽�夋嫨"
+                filterable
+              >
+                <el-option
+                  v-for="item in checktypeArr"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="鎵爜鏉$爜">
+              <el-input
+                v-model="form.orderstepqrcode"
+                name="GXproduceCode"
+                style="width: 250px"
+                placeholder="璇锋壂鐮佸伐鍗曞伐搴忕爜"
+                @keyup.enter.native="enterNative"
+              />
+            </el-form-item>
+          </el-form>
+        </div>
+
+        <div class="content1">
+          <div>
+            <i class="el-icon-s-operation" style="font-size: 14px" :style="{color:$store.state.settings.theme}" />
+          </div>
+          <div class="title">
+            宸ュ崟淇℃伅
+          </div>
+        </div>
+        <div class="content2" style="width: 60%;margin-left: 30px;">
+          <div class="orderMsg">鍗曟嵁缂栧彿锛歿{ form.wocode }}</div>
+          <div class="orderMsg">鐗╂枡缂栫爜锛歿{ form.partcode }}</div>
+          <div class="orderMsg">鐗╂枡鍚嶇О锛歿{ form.partname }}</div>
+        </div>
+        <div class="content2" style="width: 60%;margin-left: 30px;">
+          <div class="orderMsg">鐗╂枡瑙勬牸锛歿{ form.partspec }}</div>
+          <div class="orderMsg">宸ュ簭缂栫爜锛歿{ form.stepcode }}</div>
+          <div class="orderMsg">宸ュ簭鍚嶇О锛歿{ form.stepname }}</div>
+        </div>
+
+        <div class="content1">
+          <div>
+            <i class="el-icon-s-operation" style="font-size: 14px" :style="{color:$store.state.settings.theme}" />
+          </div>
+          <div class="title">
+            璐ㄦ鏂规
+          </div>
+        </div>
+        <div class="content2" style="width: 60%;margin-left: 30px;">
+          <div class="orderMsg">鏂规鍚嶇О锛歿{ form.checkstandname }}</div>
+          <div class="orderMsg">鎶芥牱鏂瑰紡锛歿{
+            form.sampmethod === 'FIXED' ? '鍥烘椂鎶芥' : form.sampmethod === 'SCARE' ? '姣斾緥鎶芥' : ''
+          }}
+          </div>
+        </div>
+        <div class="content2" style="width: 60%;margin-left: 30px;">
+          <div class="orderMsg">鎶ュ伐鏁伴噺锛歿{ form.good_qty }}</div>
+          <div class="orderMsg">鏍锋湰鏁伴噺锛�
+            <el-input-number
+              v-if="form.good_qty"
+              v-model="form.sampscare"
+              :max="form.good_qty"
+              :min="1"
+              size="medium"
+              @change="numberChange"
+            />
+          </div>
+        </div>
+
+        <div
+          v-if="checkItemArr.length>0"
+          class="content1"
+        >
+          <div>
+            <i class="el-icon-s-operation" style="font-size: 14px" :style="{color:$store.state.settings.theme}" />
+          </div>
+          <div class="title">
+            妫�楠岄」鐩�
+          </div>
+        </div>
+        <div
+          v-if="form.sampscare!==1&&checkItemArr.length>0"
+          class="content2"
+          style="width: 60%;"
+        >
+          <el-link :underline="false" :disabled="!(stepActive>0)" style="width: 60px;margin-top: 5px" @click="pre">涓婁竴浠�
+          </el-link>
+          <el-steps :active="stepActive" style="width: 70%;margin:0 10px;" finish-status="success">
+            <el-step v-for="item in form.sampscare" :key="item" title="" />
+          </el-steps>
+          <el-link
+            :underline="false"
+            :disabled="!(stepActive < form.sampscare-1)"
+            style="width: 60px;margin-top: 5px"
+            @click="next"
+          >涓嬩竴浠�
+          </el-link>
+        </div>
+
+        <div
+          class="content2"
+          style="flex-direction: column;justify-content:flex-start;width: 480px;margin-top: 10px;"
+        >
+
+          <div
+            v-for="(item,index) in checkItemArr"
+            v-if="stepActive+1===item.checkNumber"
+            :key="item.code+(stepActive+1).toString()"
+            :style="{borderBottom:(index+1)%checkItemArr.map(i=>i.checkNumber===1).filter(i=>i).length!==0?`1px solid rgba(48,49,51,0.2)`:''}"
+            class="checkItem"
+          >
+
+            <div style="display: flex;justify-content: space-between;align-items: center">
+              <div style="display: flex;width: 300px;">
+                <div class="serialNumber">{{ item.stepcheckitem_seq }}</div>
+                <div style="display: flex;align-items: center">{{ item.name }}</div>
+              </div>
+
+              <div v-show="item.numberjudge==='N'" style="width: 150px;display: flex;padding-left: 20px">
+                <el-button
+                  type="primary"
+                  size="mini"
+                  :plain="!item.check_result"
+                  @click="checkResultClick('OK',item)"
+                >鍚堟牸
+                </el-button>
+                <el-button
+                  type="warning"
+                  size="mini"
+                  :plain="item.check_result"
+                  @click="checkResultClick('NG',item)"
+                >涓嶅悎鏍�
+                </el-button>
+              </div>
+              <div v-show="item.numberjudge!=='N'" style="width: 150px;" />
+            </div>
+
+            <div style="display: flex;margin-bottom: 5px">
+              <div style="display: flex;flex-direction: column">
+                <div v-if="item.standvalue" class="itemTitle">鏍囧噯鍊�</div>
+                <div v-if="item.uppervalue" class="itemTitle">涓婇檺鍊�</div>
+                <div v-if="item.lowervalue" class="itemTitle">涓嬮檺鍊�</div>
+                <div v-if="item.stepcheckitem_desc" class="itemTitle">鎻忚堪</div>
+                <div v-if="item.numberjudge!=='N'" class="itemTitle">瀹炴祴鍊�
+                  <el-input
+                    v-model="item.real_value"
+                    size="mini"
+                    oninput="value=value.replace(/[^0-9]/g,'')"
+                    style="width: 100px;margin-left: 5px"
+                    @input="val=>inputChange(val,item)"
+                  />
+                </div>
+              </div>
+              <div style="display: flex;flex-direction: column">
+                <div v-if="item.standvalue" class="itemContent">{{ item.standvalue }}</div>
+                <div v-if="item.uppervalue" class="itemContent">{{ item.uppervalue }}</div>
+                <div v-if="item.lowervalue" class="itemContent">{{ item.lowervalue }}</div>
+                <div v-if="item.stepcheckitem_desc" class="itemContent">{{ item.stepcheckitem_desc }}</div>
+
+                <div v-show="item.numberjudge!=='N'" class="itemContent" style="width: 150px;display: flex">
+                  <el-button
+                    type="primary"
+                    size="mini"
+                    :disabled="item.required==='Y'&&!item.real_value"
+                    :plain="!item.check_result"
+                    @click="checkResultClick('OK',item)"
+                  >鍚堟牸
+                  </el-button>
+                  <el-button
+                    type="warning"
+                    size="mini"
+                    :disabled="item.required==='Y'&&!item.real_value"
+                    :plain="item.check_result"
+                    @click="checkResultClick('NG',item)"
+                  >
+                    涓嶅悎鏍�
+                  </el-button>
+                </div>
+              </div>
+            </div>
+
+          </div>
+
+        </div>
+
+        <div
+          v-if="checkItemArr.filter(i=>i.check_result!=='').length===checkItemArr.length&&checkItemArr.length>0"
+          class="content1"
+        >
+          <div>
+            <i class="el-icon-s-operation" style="font-size: 14px" :style="{color:$store.state.settings.theme}" />
+          </div>
+          <div class="title">
+            妫�楠岀粨鏋�
+          </div>
+        </div>
+
+        <div
+          v-if="checkItemArr.filter(i=>i.check_result!=='').length===checkItemArr.length&&checkItemArr.length>0"
+          class="content2"
+          style="width: 60%;margin-left: 30px;"
+        >
+          <div class="orderMsg2">鏍锋湰鏁伴噺锛歿{ form.sampscare }}</div>
+          <div class="orderMsg2">鍚堟牸鏁伴噺锛歿{ form.goodqty }}</div>
+          <div class="orderMsg2">涓嶅悎鏍兼暟閲忥細{{ form.ngqty }}</div>
+
+          <div style="width: 290px;display: flex;align-items: center" class="resultButton">
+            <div style="width: 70px;">鍒ゅ畾缁撴灉锛�</div>
+            <el-button type="primary" size="medium" :plain="!check_result" @click="check_result=true">鍚堟牸</el-button>
+            <el-button type="warning" size="medium" :plain="check_result" @click="check_result=false">涓嶅悎鏍�</el-button>
+          </div>
+        </div>
+
+        <div
+          v-if="checkItemArr.filter(i=>i.check_result!=='').length===checkItemArr.length&&checkItemArr.length>0"
+          class="content2   submitButton"
+          style="margin-top: 10px;margin-bottom: 10px;"
+        >
+          <el-button
+            v-waves
+            type="primary"
+            @click="submitButton"
+          >鎻愪氦
+          </el-button>
+        </div>
+
+      </div>
+
+    </div>
+  </div>
+</template>
+
+<script>
+import waves from '@/directive/waves'
+import $ from 'jquery'
+import { MesOrderStepCheckItemList, MesOrderStepCheckSearch, SaveMesOrderStepCheckItem } from '@/api/QualityManagement'
+import { getCookie } from '@/utils/auth'
+
+export default {
+  name: 'Zzjg',
+
+  directives: { waves },
+  data() {
+    return {
+      mouseHoverType: 'mouseout',
+      isExpandForm: false,
+      mainHeight: 0,
+      tableHeight: 0,
+
+      form: {
+        orderstepqrcode: '', // 鎵弿宸ュ簭浜岀淮鐮佷俊鎭�
+        checktype: 'FirstCheck',
+
+        wocode: '',
+        partcode: '',
+        partname: '',
+        partspec: '',
+        stepcode: '',
+        stepname: '',
+        checkstandcode: '',
+        checkstandname: '',
+        check_type: '',
+        sampmethod: '', // FIXED(鍥烘椂鎶芥)  SCARE(姣斾緥鎶芥)
+        sampscare: '',
+        qualitystatus: '',
+        good_qty: '', // 鎸囩殑鎶ュ伐鏁伴噺
+        sampleqty: '',
+        goodqty: '', // 鍚堟牸鏁伴噺
+        ngqty: '', // 涓嶈壇鏁伴噺
+        // checkitemcont: [],
+
+        username: getCookie('admin')
+
+      },
+      checktypeArr: [
+        { code: 'FirstCheck', name: '棣栨' },
+        { code: 'PatroCheck', name: '宸℃' },
+        { code: 'EndCheck', name: '瀹屽伐妫�' }
+      ],
+      stepActive: 0, // 褰撳墠澶勪簬绗嚑浠�
+
+      checkItemArr: [],
+      check_result: ''
+
+    }
+  },
+
+  watch: {
+    'checkItemArr': {
+      deep: true, // 娣卞害鐩戝惉鏃�  鐩戝惉鍒板睘鎬�              褰撲笉涓烘繁搴︾洃鍚椂锛屽彲鐩戝惉闀垮害
+      handler: function(val) {
+        // do something with the new and old value of myArray
+        this.form.goodqty = 0
+        for (var i = 0; i < this.form.sampscare; i++) {
+          const flag = this.checkItemArr.filter(j => j.checkNumber === i + 1).every(j => j.check_result)
+          if (flag) {
+            this.form.goodqty++
+          }
+        }
+        this.form.ngqty = this.form.sampscare - this.form.goodqty
+      }
+    }
+  },
+
+  created() {
+
+  },
+  mounted() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+
+    this.getFocus()
+  },
+  methods: {
+    // 鑾峰彇鑱氱劍
+    getFocus() {
+      this.$nextTick(() => {
+        $('input[name=\'GXproduceCode\']')[0].focus()
+      })
+    },
+    async enterNative() {
+      const data = {
+        orderstepqrcode: this.form.orderstepqrcode,
+        checktype: this.form.checktype,
+        stu_torgcode: getCookie('stu_torgcode')
+      }
+      const { data: res } = await MesOrderStepCheckSearch(data)
+      this.form.wocode = res.labcont[0].wo_code
+      this.form.partcode = res.labcont[0].partcode
+      this.form.partname = res.labcont[0].partname
+      this.form.partspec = res.labcont[0].partspec ? res.labcont[0].partspec : '/'
+      this.form.stepcode = res.labcont[0].stepcode
+      this.form.stepname = res.labcont[0].stepname
+      this.form.good_qty = res.labcont[0].good_qty
+
+      this.form.checkstandcode = res.chekstand[0].checkstandcode
+      this.form.checkstandname = res.chekstand[0].checkstandname
+      this.form.sampmethod = res.chekstand[0].sampmethod
+
+      this.form.sampscare = res.chekstand[0].sampmethod === 'FIXED' ? res.chekstand[0].sampscare
+        : res.labcont[0].good_qty * res.chekstand[0].sampscare / 100
+      this.form.sampscare = this.form.sampscare <= this.form.good_qty ? this.form.sampscare : this.form.good_qty
+
+      await this.getMesOrderStepCheckItemList()
+    },
+    async getMesOrderStepCheckItemList() {
+      const { data: res } = await MesOrderStepCheckItemList({ checkstandcode: this.form.checkstandcode })
+      // this.checkItemArr = res
+      this.checkItemArr = []
+      for (let i = 0; i < this.form.sampscare; i++) {
+        res.forEach(j => {
+          this.checkItemArr.push({
+            checkNumber: i + 1,
+            stepcheckitem_seq: j.stepcheckitem_seq,
+            name: j.name,
+            code: j.code,
+            standvalue: j.standvalue,
+            lowervalue: j.lowervalue,
+            uppervalue: j.uppervalue,
+
+            unit: j.unit,
+            stepcheckitem_desc: j.stepcheckitem_desc,
+            required: j.required, // 鏄惁蹇呭~
+            numberjudge: j.numberjudge, // 鏁板�煎垽鏂�
+            real_value: '',
+            check_result: j.numberjudge === 'Y' ? '' : true
+          })
+        })
+      }
+
+      if (this.checkItemArr.every(i => i.check_result)) {
+        this.check_result = true
+      } else {
+        this.check_result = ''
+      }
+    },
+
+    numberChange(currentValue, oldValue) {
+      const t = this.checkItemArr.filter(i => i.checkNumber === 1)
+
+      // 浠舵暟鍙樺皯鏃舵墽琛�
+      if (currentValue < this.checkItemArr.length / t.length) {
+        this.checkItemArr.reverse()
+        this.checkItemArr.splice(0, t.length * (oldValue - currentValue))
+        this.checkItemArr.reverse()
+
+        this.stepActive = currentValue - 1
+      }
+      // 浠舵暟鍙樺鏃舵墽琛�
+      if (currentValue > this.checkItemArr.length / t.length) {
+        for (let i = currentValue; i > oldValue; i--) {
+          t.forEach(j => {
+            this.checkItemArr.push({
+              checkNumber: i,
+              name: j.name,
+              code: j.code,
+              standvalue: j.standvalue,
+              lowervalue: j.lowervalue,
+              uppervalue: j.uppervalue,
+
+              unit: j.unit,
+              stepcheckitem_desc: j.stepcheckitem_desc,
+              required: j.required, // 鏄惁蹇呭~
+              numberjudge: j.numberjudge, // 鏁板�煎垽鏂�
+              real_value: '',
+              check_result: j.numberjudge === 'Y' ? '' : true
+            })
+          })
+        }
+        this.checkItemArr.sort((a, b) => a.checkNumber - b.checkNumber)
+      }
+    },
+
+    pre() {
+      if (this.stepActive > 0) {
+        this.stepActive--
+      }
+    },
+    next() {
+      if (this.stepActive < this.form.sampscare) {
+        this.stepActive++
+      }
+    },
+
+    inputChange(val, item) {
+      if (val !== '') {
+        if (item.numberjudge === 'Y') { // 濡傛灉闇�瑕佽繘琛屾暟鍊煎垽鏂�
+          if (item.uppervalue === '' && item.lowervalue === '') { // 涓婇檺鍊间负绌猴紝涓嬮檺鍊间负绌�
+            item.check_result = parseFloat(val) === parseFloat(item.standvalue)
+          }
+
+          if (item.uppervalue !== '' && item.lowervalue !== '') { // 涓婇檺鍊间笉涓虹┖锛屼笅闄愬�间笉涓虹┖
+            item.check_result = parseFloat(val) >= parseFloat(item.lowervalue) && parseFloat(val) <=
+              parseFloat(item.uppervalue)
+          }
+
+          if (item.uppervalue !== '' && item.lowervalue === '') { // 涓婇檺鍊间笉涓虹┖锛屼笅闄愬�间负绌�
+            item.check_result = parseFloat(val) <= parseFloat(item.uppervalue)
+          }
+
+          if (item.uppervalue === '' && item.lowervalue !== '') { // 涓婇檺鍊间负绌猴紝涓嬮檺鍊间笉涓虹┖
+            item.check_result = parseFloat(val) >= parseFloat(item.lowervalue)
+          }
+        }
+      }
+
+      if (val === '') {
+        item.check_result = ''
+      }
+
+      this.check_result = !!this.checkItemArr.every(i => i.check_result)
+    },
+
+    checkResultClick(val, item) {
+      item.check_result = val === 'OK'
+
+      if (this.checkItemArr.filter(i => i.check_result !== '').length === this.checkItemArr.length) {
+        this.check_result = !!this.checkItemArr.every(i => i.check_result)
+      }
+    },
+
+    submitButton() {
+      this.$confirm('鏄惁纭鎻愪氦?', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        const checkitemcont = []
+        this.checkItemArr.forEach((i, index) => {
+          checkitemcont.push({
+            checknum: i.checkNumber + '/' + this.checkItemArr.length / this
+              .checkItemArr.filter(j => j.checkNumber === 1).length,
+            checkiem_seq: i.stepcheckitem_seq,
+            checkitem_code: i.code,
+            checkitem_name: i.name,
+            check_value: i.real_value ? i.real_value : '',
+            check_result: i.check_result ? 'OK' : 'NG',
+            checkitem_descr: ''
+          })
+        })
+
+        const data = {
+          stu_torgcode: getCookie('stu_torgcode'),
+          wocode: this.form.wocode,
+          partcode: this.form.partcode,
+          stepcode: this.form.stepcode,
+          checkstandcode: this.form.checkstandcode,
+          check_type: this.form.checktype,
+          sampmethod: this.form.sampmethod,
+          qualitystatus: this.check_result ? 'OK' : 'NG',
+          good_qty: this.form.good_qty,
+          sampleqty: this.form.sampscare,
+          goodqty: this.form.goodqty,
+          ngqty: this.form.ngqty,
+          admin: this.form.username,
+          checkitemcont
+        }
+
+        SaveMesOrderStepCheckItem(data).then(res => {
+          if (res.code === '200') {
+            this.form.orderstepqrcode = ''
+
+            this.form.wocode = ''
+            this.form.partcode = ''
+            this.form.partname = ''
+            this.form.partspec = ''
+            this.form.stepcode = ''
+            this.form.stepname = ''
+            this.form.checkstandcode = ''
+            this.form.checkstandname = ''
+            this.form.check_type = ''
+            this.form.sampmethod = ''// FIXED(鍥烘椂鎶芥)  SCARE(姣斾緥鎶芥)
+            this.form.sampscare = ''
+            this.form.qualitystatus = ''
+            this.form.good_qty = '' // 鎸囩殑鎶ュ伐鏁伴噺
+            this.form.sampleqty = ''
+            this.form.goodqty = '' // 鍚堟牸鏁伴噺
+            this.form.ngqty = '' // 涓嶈壇鏁伴噺
+            this.stepActive = 0
+            this.checkItemArr = []
+            this.check_result = ''
+            this.$message.success('妫�楠屾垚鍔燂紒')
+            this.getFocus()
+          }
+        })
+      })
+    },
+
+    // 鑾峰彇椤甸潰楂樺害
+    getHeight() {
+      this.$nextTick(() => {
+        this.mainHeight = window.innerHeight - 85
+        this.tableHeight = this.mainHeight - 255
+      })
+    },
+    tableRowClassName({ row, rowIndex }) {
+      return 'custom-row'
+    }
+  }
+}
+</script>
+
+<!--鍏叡椤甸潰鏍峰紡-->
+<style lang="scss" scoped>
+$main_color: #42b983;
+::v-deep .el-button--text {
+  font-size: 14px;
+  cursor: pointer;
+}
+
+.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
+  color: $main_color;
+  cursor: pointer;
+}
+
+.el-icon-edit-outline {
+  margin-right: 15px;
+}
+
+::v-deep .el-button--primary, .el-button--warning, .el-button--default, .el-button--info {
+  //height: 34px;
+  //display: flex;
+  //align-items: center;
+  //padding: 0 15px;
+  width: 58px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.submitButton {
+  ::v-deep .el-button--primary {
+    width: 160px;
+    letter-spacing: 10px;
+    padding-left: 25px;
+    font-size: 18px;
+    //display: flex;
+    //justify-content: center;
+    //align-items: center;
+  }
+}
+
+.resultButton {
+  ::v-deep .el-button--primary {
+    width: 100px;
+    letter-spacing: 4px;
+    padding-left: 22px;
+  }
+
+  ::v-deep .el-button--warning {
+    width: 100px;
+    letter-spacing: 4px;
+    padding-left: 22px;
+  }
+}
+
+::v-deep .el-button--default {
+  background-color: #f8f8fa;
+  border: none;
+}
+
+::v-deep .el-input__inner {
+  height: 34px;
+  line-height: 34px;
+  //color: #a7a7a7;
+}
+
+::v-deep .el-dialog__body {
+  padding: 20px 100px !important;
+}
+
+::v-deep .dialogVisibleRoles .el-dialog__body {
+  padding: 20px 20px !important;
+}
+
+::v-deep .importPickerClass .el-dialog__body {
+  padding: 20px 20px !important;
+}
+
+::v-deep .el-dialog__footer {
+  display: flex;
+  justify-content: flex-end;
+}
+
+::v-deep .el-table .caret-wrapper {
+  transform: scale(0.8);
+}
+
+::v-deep .cell {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+::v-deep .el-table::before {
+  height: 0;
+}
+
+::v-deep .el-table__body-wrapper {
+  background-color: #f8f8fa;
+}
+
+::v-deep .el-table__body .el-table__row.hover-row td {
+  background-color: #eaecef;
+}
+
+::v-deep .el-form--inline .el-form-item__label {
+  //color: #a7a7a7;
+  //font-size: 16px;
+}
+
+.body ::v-deep .el-divider {
+  border: 1px solid #eee;
+  width: 99%;
+  margin: 10px auto;
+}
+
+.body ::v-deep .el-form-item {
+  margin-bottom: 0;
+}
+
+.userDialogVisible ::v-deep .el-form-item {
+  margin-bottom: 0;
+}
+
+::v-deep .el-select__caret {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.tableFixed {
+  ::v-deep .el-table__fixed-right {
+    height: 100% !important;
+  }
+
+  ::v-deep .el-table__fixed {
+    height: 100% !important;
+  }
+}
+</style>
+
+<style lang="scss" scoped>
+.content1 {
+  display: flex;
+  align-items: center;
+  margin: 10px 0 0 10px;
+
+  .title {
+    font-size: 14px;
+    font-weight: bold;
+    margin-left: 5px;
+  }
+}
+
+.content2 {
+  margin: 10px 0 0 20px;
+  display: flex;
+  font-size: 14px;
+  width: 100%;
+  align-items: center;
+}
+
+.orderMsg {
+  width: 33.33%;
+  display: flex;
+  align-items: center;
+}
+
+::v-deep .el-input-number--medium {
+  line-height: 32px;
+  width: 120px;
+}
+
+.checkItem {
+  display: flex;
+  justify-content: space-between;
+  min-height: 36px;
+
+  align-items: center;
+  flex-direction: column;
+  margin-top: 5px;
+}
+
+.serialNumber {
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
+  background-color: #42B983;
+  color: #fff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 10px;
+}
+
+.itemTitle {
+  width: 300px;
+  padding-left: 40px;
+  height: 26px;
+  color: #909399;
+  display: flex;
+  align-items: center;
+
+  ::v-deep .el-input--mini {
+    line-height: 24px;
+    height: 24px;
+  }
+
+  ::v-deep .el-input__inner {
+    line-height: 24px;
+    height: 24px;
+  }
+}
+
+.itemContent {
+  width: 150px;
+  height: 26px;
+  padding-left: 20px;
+  display: flex;
+  align-items: center;
+
+}
+
+.orderMsg2 {
+  width: 200px;
+}
+</style>
+
+<style>
+
+.el-table .custom-row {
+  background: #f8f8fa;
+}
+</style>
diff --git a/src/views/qualityManager/processCheckItem.vue b/src/views/qualityManager/processCheckItem.vue
index e69de29..916913c 100644
--- a/src/views/qualityManager/processCheckItem.vue
+++ b/src/views/qualityManager/processCheckItem.vue
@@ -0,0 +1,406 @@
+<template>
+  <div>
+    <div class="body" :style="{height:mainHeight+'px'}">
+
+      <div class="bodyTopButtonGroup">
+        <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+        <!--        <el-button v-waves type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
+      </div>
+      <div class="bodyTopFormGroup">
+        <el-form
+          ref="form"
+          :model="form"
+          label-width="100px"
+          inline
+          style="display: flex"
+        >
+          <div class="elForm">
+            <el-form-item label="椤圭洰缂栫爜" style=" display: flex;">
+              <el-input v-model="form.itemcode" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+            <el-form-item label="椤圭洰鍚嶇О" style=" display: flex;">
+              <el-input v-model="form.itemname" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+            <el-form-item label="椤圭洰鎻忚堪" style=" display: flex;">
+              <el-input v-model="form.itemdescr" style="width: 200px" placeholder="璇疯緭鍏�" />
+            </el-form-item>
+          </div>
+          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
+            <el-button v-waves type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+            <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+          </div>
+        </el-form>
+        <div
+          class="bodyTopFormExpand"
+        />
+      </div>
+      <div class="elTableDiv">
+        <!--        <TableColumnSettings-->
+        <!--          :list1="tableColumnSettingsArray"-->
+        <!--          @tableColumnUpdate="tableColumnUpdate"-->
+        <!--        />-->
+        <el-table
+          ref="tableDataRef"
+          :key="tableTimeStampKey"
+          class="tableFixed"
+          :data="tableData"
+          :height="tableHeight+'px'"
+          border
+          :row-class-name="tableRowClassName"
+          :style="{width: 100+'%',height:tableHeight+'px',}"
+          highlight-current-row
+          :header-cell-style="this.$headerCellStyle"
+          :cell-style="this.$cellStyle"
+          @sort-change="sortChange"
+        >
+
+          <el-table-column
+            v-for="item in tableColumnSettingsArray"
+            v-if="item.show"
+            :key="item.id"
+            :sortable="item.sortable"
+            :prop="item.prop"
+            :min-width="item.minWidth"
+            :label="item.label"
+            :width="item.width"
+            show-tooltip-when-overflow
+            :fixed="item.fixed?(item.fixed==='left'?'left':'right'):false"
+          >
+            <template slot-scope="{row}">
+              <div v-if="!row[item.prop]">/</div>
+              <div v-else>{{ row[item.prop] }}</div>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            label="鎿嶄綔"
+            fixed="right"
+            width="120"
+          >
+            <template slot-scope="{row}">
+              <div class="operationClass">
+                <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+                  <i :style="{color:$store.state.settings.theme}" class="el-icon-edit-outline" @click="edit('edit',row)" />
+                </el-tooltip>
+                <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
+                  <i :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row)" />
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <!--鍒嗛〉-->
+      <pagination
+        :total="total"
+        :page.sync="form.page"
+        :limit.sync="form.rows"
+        align="right"
+        layout="total,prev, pager, next,sizes,jumper"
+        popper-class="select_bottom"
+        @pagination="getStepCheckItemSearch"
+      />
+    </div>
+
+    <el-dialog
+      v-el-drag-dialog
+      :title="operation==='add'?'鏂板':'缂栬緫'"
+      :visible.sync="dialogVisible"
+      width="800px"
+      :close-on-click-modal="false"
+      top="15vh"
+      @closed="handleClose"
+      @close="handleClose"
+    >
+      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+        <el-form-item label="椤圭洰缂栫爜" prop="checkitemcode">
+          <el-input v-model="dialogForm.checkitemcode" :disabled="operation!=='add'" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="椤圭洰鍚嶇О" prop="checkitemname">
+          <el-input v-model="dialogForm.checkitemname" style="width: 200px" />
+        </el-form-item>
+
+        <el-form-item label="椤圭洰鎻忚堪" prop="checkitemdescr">
+          <el-input v-model="dialogForm.checkitemdescr" type="textarea" style="width: 200px" />
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <div class="footerButton">
+          <el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
+          <el-button
+            v-waves
+            type="primary"
+            :loading="$store.state.app.buttonIsDisabled"
+            :disabled="$store.state.app.buttonIsDisabled"
+            @click="dialogVisibleConfirm"
+          >纭� 瀹�</el-button>
+        </div>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination'
+import { AddUpdateStepCheckItem, DeleteStepCheckItem, StepCheckItemSearch } from '@/api/QualityManagement'
+import { validateCode } from '@/utils/global'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
+import TableColumnSettings from '@/components/TableColumnSettings'
+import { PrentOrganization } from '@/api/GeneralBasicData'
+
+export default {
+  name: 'ProcessCheckItem',
+  components: {
+    Pagination, TableColumnSettings
+  },
+  directives: { elDragDialog, waves },
+  data() {
+    return {
+      mainHeight: 0,
+      tableHeight: 0,
+      form: {
+        itemcode: '', // 椤圭洰浠g爜
+        itemname: '', // 椤圭洰鍚嶇О
+        itemdescr: '', // 椤圭洰鎻忚堪
+        prop: 'lm_date', // 鎺掑簭瀛楁
+        order: 'desc', // 鎺掑簭瀛楁
+        page: 1, // 绗嚑椤�
+        rows: 20 // 姣忛〉澶氬皯鏉�
+      },
+      total: 10,
+      tableData: [],
+      tableColumnSettingsArray: [
+        // { minWidth: 50, width: false, prop: 'id', label: 'id', id: 1, show: false, fixed: false, sortable: false }, // 闅愯棌鍒�  show: false闅愯棌锛宼rue鏄剧ず
+        { minWidth: 25, width: 50, prop: 'rowNum', label: '搴忓彿', id: 2, show: true, fixed: 'left', sortable: false }, // custom
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'code',
+          label: '鏍囧噯浠g爜',
+          id: 3,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'name',
+          label: '鏍囧噯鍚嶇О',
+          id: 4,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'org_code',
+          label: '鎵�灞炶溅闂寸紪鐮�',
+          id: 5,
+          show: false,
+          fixed: false,
+          sortable: true
+        }, {
+          minWidth: 110,
+          width: false,
+          prop: 'org_name',
+          label: '鎵�灞炶溅闂�',
+          id: 6,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 330,
+          width: false,
+          prop: 'descr',
+          label: '鏍囧噯鎻忚堪',
+          id: 7,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'lm_user',
+          label: '鍒涘缓浜哄憳',
+          id: 8,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'lm_date',
+          label: '鍒涘缓鏃堕棿',
+          id: 9,
+          show: true,
+          fixed: false,
+          sortable: true
+        }
+      ],
+      tableTimeStampKey: new Date().getTime(), // 琛ㄦ牸key
+
+      dialogVisible: false,
+      dialogForm: {
+        checkitemcode: '', // 宸ュ簭妫�楠岄」鐩紪鐮�
+        checkitemname: '', // 宸ュ簭妫�楠岄」鐩悕绉�
+        checkitemdescr: '' // 宸ュ簭妫�楠岄」鐩弿杩�
+      },
+      operation: '',
+      dialogFormRules: {
+        checkitemcode: [
+          { required: true, validator: validateCode, trigger: ['blur', 'change'] }
+        ],
+        checkitemname: [
+          { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
+        ],
+        workshopcode: [
+          { required: true, message: '璇烽�夋嫨鎵�灞炶溅闂�', trigger: ['blur', 'change'] }
+        ]
+      }
+    }
+  },
+  created() {
+    this.getStepCheckItemSearch()
+  },
+  mounted() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+  },
+  methods: {
+    tableColumnUpdate(val, isCopyTrue) {
+      if (isCopyTrue) {
+        this.tableColumnSettingsArray = val
+      }
+      this.tableTimeStampKey = new Date().getTime()
+      this.$refs.tableDataRef.doLayout()
+    },
+    async getStepCheckItemSearch() {
+      const res = await StepCheckItemSearch(this.form)
+      this.tableData = res.data
+      this.total = res.count
+    },
+    // 鎺掑簭鏀瑰彉鏃�
+    sortChange({ column, prop, order }) {
+      if (order === 'descending') {
+        order = 'desc'
+      } else if (order === 'ascending') {
+        order = 'asc'
+      } else {
+        order = 'desc'
+      }
+      this.form.order = order
+      this.form.prop = prop
+      this.getStepCheckItemSearch()
+    },
+    // 鏌ヨ
+    search() {
+      this.getStepCheckItemSearch()
+    },
+    upload() {
+
+    },
+    // 閲嶇疆
+    reset() {
+      this.form.itemcode = ''
+      this.form.itemname = ''
+      this.form.itemdescr = ''
+      this.getStepCheckItemSearch()
+    },
+
+    // 鏂板鎸夐挳
+    add(operation) {
+      this.operation = operation
+      this.dialogVisible = true
+    },
+    // 淇敼鎸夐挳
+    edit(operation, row) {
+      this.operation = operation
+      this.dialogVisible = true
+
+      this.$nextTick(() => {
+        this.dialogForm.checkitemcode = row.code
+        this.dialogForm.checkitemname = row.name
+        this.dialogForm.workshopcode = row.org_code
+        this.dialogForm.checkitemdescr = row.descr
+      })
+    },
+    // 鍒犻櫎鎸夐挳
+    async del(row) {
+      this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        DeleteStepCheckItem({ checkitemcode: row.code }).then(res => {
+          if (res.code === '200') {
+            this.$message.success('鍒犻櫎鎴愬姛!')
+            if (this.form.page > 1 && this.tableData.length === 1) {
+              this.form.page--
+            }
+            this.getStepCheckItemSearch()
+          }
+        })
+      }).catch(() => {
+        this.$message.info('宸插彇娑堝垹闄�')
+      })
+    },
+    // 瀵硅瘽妗嗗叧闂簨浠�
+    handleClose() {
+      this.dialogForm.checkitemcode = ''
+      this.dialogForm.checkitemname = ''
+      this.dialogForm.checkitemdescr = ''
+      this.dialogForm.workshopcode = ''
+      this.$refs.dialogForm.clearValidate()
+    },
+    // 瀵硅瘽妗嗗彇娑�
+    dialogVisibleCancel() {
+      this.dialogVisible = false
+    },
+    // 瀵硅瘽妗嗙‘璁�
+    dialogVisibleConfirm() {
+      this.$refs.dialogForm.validate(valid => {
+        if (valid) {
+          this.$store.state.app.buttonIsDisabled = true
+          const data = {
+            checkitemcode: this.dialogForm.checkitemcode,
+            checkitemname: this.dialogForm.checkitemname,
+            checkitemdescr: this.dialogForm.checkitemdescr,
+            wkshopcode: this.dialogForm.workshopcode,
+            OperType: this.operation === 'add' ? 'Add' : 'Update'
+          }
+          AddUpdateStepCheckItem(data).then(res => {
+            if (res.code === '200') {
+              this.dialogVisible = false
+              this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+              this.getStepCheckItemSearch()
+              this.$store.state.app.buttonIsDisabled = false
+            } else {
+              this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+            }
+          })
+        }
+      })
+    },
+    // 鑾峰彇椤甸潰楂樺害
+    getHeight() {
+      this.$nextTick(() => {
+        this.mainHeight = window.innerHeight - 85
+        this.tableHeight = this.mainHeight - 195
+        this.$refs.tableDataRef.doLayout()
+        // if (window.innerHeight < 769) {
+        //   this.tableHeight = this.tableHeight - 50
+        // }
+      })
+    },
+    tableRowClassName({ row, rowIndex }) {
+      return 'custom-row'
+    }
+  }
+}
+</script>
diff --git a/src/views/qualityManager/processCheckRecord.vue b/src/views/qualityManager/processCheckRecord.vue
index 1be8c89..76aacc5 100644
--- a/src/views/qualityManager/processCheckRecord.vue
+++ b/src/views/qualityManager/processCheckRecord.vue
@@ -1,11 +1,731 @@
-<template />
+<template>
+  <div>
+    <div class="body" :style="{height:mainHeight+'px'}">
+      <div class="bodyTopButtonGroup">
+        <el-button v-waves type="primary" icon="el-icon-download" @click="download">瀵煎嚭</el-button>
+        <!--        <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>-->
+        <!--        <el-button v-waves icon="el-icon-download" @click="upload">瀵煎叆</el-button>-->
+      </div>
+
+      <div class="bodyTopFormGroup">
+        <el-form
+          ref="form"
+          :model="form"
+          label-width="100px"
+          inline
+          style="display: flex;"
+        >
+          <div class="elForm">
+            <el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
+              <el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+            <el-form-item label="浜у搧缂栫爜" style=" display: flex;">
+              <el-input v-model="form.partcode" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+            <el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
+              <el-input v-model="form.partname" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+            <el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">
+              <el-input v-model="form.partapec" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+            <el-form-item v-show="isExpandForm" label="宸ュ簭鍚嶇О" style=" display: flex;">
+              <el-input v-model="form.stepname" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+            <el-form-item v-show="isExpandForm" label="鏍囧噯鍚嶇О" style=" display: flex;">
+              <el-input v-model="form.standname" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+            <el-form-item v-show="isExpandForm" label="妫�楠岀被鍨�" style=" display: flex;">
+              <el-select v-model="form.checktype" style="width: 200px" placeholder="璇烽�夋嫨">
+                <el-option
+                  v-for="item in checktypeArr"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item v-show="isExpandForm" label="妫�楠岀粨鏋�" style=" display: flex;">
+              <el-select v-model="form.checkresult	" style="width: 200px" placeholder="璇烽�夋嫨">
+                <el-option
+                  v-for="item in checkresultArr"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+          </div>
+          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
+            <el-button v-waves type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+            <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+          </div>
+        </el-form>
+
+        <div
+          class="bodyTopFormExpand"
+        >
+          <svg-icon
+            v-show="mouseHoverType==='mouseout'"
+            style="cursor: pointer"
+            :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
+            @mouseenter="mouseHoverType=$event.type"
+          />
+          <svg-icon
+            v-show="mouseHoverType==='mouseenter'"
+            style="cursor: pointer"
+            :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
+            @click="isExpandForm=!isExpandForm"
+            @mouseout="mouseHoverType=$event.type"
+          />
+        </div>
+      </div>
+
+      <div class="elTableDiv">
+        <!--        <TableColumnSettings-->
+        <!--          :list1="tableColumnSettingsArray"-->
+        <!--          @tableColumnUpdate="tableColumnUpdate"-->
+        <!--        />-->
+        <el-table
+          :key="tableTimeStampKey"
+          ref="tableDataRef"
+          class="tableFixed"
+          :data="tableData"
+          :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
+          border
+          :row-class-name="tableRowClassName"
+          :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px'}"
+          highlight-current-row
+          :header-cell-style="this.$headerCellStyle"
+          :cell-style="this.$cellStyle"
+          @sort-change="sortChange"
+        >
+
+          <el-table-column
+            v-for="item in tableColumnSettingsArray"
+            v-if="item.show"
+            :key="item.id"
+            :sortable="item.sortable"
+            :prop="item.prop"
+            :min-width="item.minWidth"
+            :label="item.label"
+            :width="item.width"
+            show-tooltip-when-overflow
+            :fixed="item.fixed?(item.fixed==='left'?'left':'right'):false"
+          >
+            <template slot-scope="{row}">
+              <div v-if="!row[item.prop]">/</div>
+              <div v-else-if="item.prop==='check_type'">
+                {{ checktypeArr.find(i=>i.code===row[item.prop]).name }}
+              </div>
+              <div v-else-if="item.prop==='check_result'">
+                <div v-if="row.check_result==='NG'">
+                  <i class="el-icon-info" style="margin-right: 2px" />
+                  涓嶈壇
+                </div>
+                <div v-if="row.check_result==='OK'">
+                  <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+                  鍚堟牸
+                </div>
+              </div>
+              <div v-else>{{ row[item.prop] }}</div>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            label="鎿嶄綔"
+            fixed="right"
+            width="120"
+          >
+            <template slot-scope="{row}">
+              <div class="operationClass">
+                <!--                <el-button v-waves type="text" @click="check(row)">鏌ョ湅</el-button>-->
+                <!--                <el-button v-waves type="text" @click="del(row)">鍒犻櫎</el-button>-->
+
+                <el-tooltip class="item" effect="dark" content="鏌ョ湅" placement="top">
+                  <i
+                    class="el-icon-view"
+                    :style="{color:$store.state.settings.theme}"
+                    style="cursor: pointer;margin-right: 15px;"
+                    @click="check(row)"
+                  />
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <!--鍒嗛〉-->
+      <pagination
+        :total="total"
+        :page.sync="form.page"
+        :limit.sync="form.rows"
+        align="right"
+        layout="prev, pager, next,sizes,jumper"
+        popper-class="select_bottom"
+        @pagination="getStepCheckTableSearch"
+      />
+    </div>
+
+    <el-dialog
+      v-el-drag-dialog
+      title="宸ュ簭妫�楠屾槑缁�"
+      :visible.sync="dialogVisible"
+      width="900px"
+      :close-on-click-modal="false"
+      top="15vh"
+      @closed="handleClose"
+      @close="handleClose"
+    >
+      <div class="elTableDiv">
+        <el-table
+          ref="tableDataRef2"
+          :data="tableDataDialog"
+          :height="(tableHeight-100)+'px'"
+          border
+          :row-class-name="tableRowClassName"
+          :style="{width: 100+'%',height:(tableHeight-100)+'px',}"
+          highlight-current-row
+          :header-cell-style="this.$headerCellStyle"
+          :cell-style="this.$cellStyle"
+        >
+          <!--          <el-table-column-->
+          <!--            type="selection"-->
+          <!--            width="50"-->
+          <!--            fixed-->
+          <!--          />-->
+          <el-table-column
+            type="index"
+            width="50"
+            label="搴忓彿"
+            fixed
+          />
+
+          <!--          <el-table-column-->
+          <!--            prop="checkitem_code"-->
+          <!--            show-tooltip-when-overflow-->
+          <!--            label="妫�楠岄」鐩紪鍙�"-->
+          <!--            width="120"-->
+          <!--          />-->
+          <el-table-column
+            prop="checkitem_name"
+            label="妫�楠岄」鐩悕绉�"
+            fixed
+            show-tooltip-when-overflow
+          />
+          <!--          <el-table-column-->
+          <!--            prop="checkitem_descr"-->
+          <!--            label="妫�楠岄」鐩弿杩�"-->
+          <!--            show-tooltip-when-overflow-->
+          <!--          />-->
+          <el-table-column
+            prop="standvalue"
+            label="鏍囧噯瑕佹眰"
+            fixed
+            min-width="120"
+            show-tooltip-when-overflow
+          >
+            <template slot-scope="{row}">
+              <!--        ~褰撲笁涓�奸兘鏈�    -->
+              <div v-if="row.standvalue&&row.uppervalue&&row.lowervalue">{{ row.standvalue }}({{
+                row.lowervalue
+              }}~{{ row.uppervalue }})
+              </div>
+              <!--            ~褰撳彧鏈夋爣鍑嗗�煎拰涓婇檺鍊兼椂  -->
+              <div v-else-if="row.standvalue&&row.uppervalue">{{ row.standvalue }}(~{{ row.uppervalue }})</div>
+              <!--            ~褰撳彧鏈夋爣鍑嗗�煎拰涓嬮檺鍊兼椂-->
+              <div v-else-if="row.standvalue&&row.lowervalue">{{ row.standvalue }}({{ row.lowervalue }}~)</div>
+
+              <!--            ~褰撳彧鏈変笂闄愬�煎拰涓嬮檺鍊兼椂-->
+              <div v-else-if="row.uppervalue&&row.lowervalue">({{ row.lowervalue }}~{{ row.uppervalue }})</div>
+              <!--            ~褰撳彧鏈夋爣鍑嗗�兼椂     -->
+              <div v-else-if="row.standvalue">{{ row.standvalue }}</div>
+              <!--            ~褰撳彧鏈変笂闄愬�兼椂       -->
+              <div v-else-if="row.uppervalue">(~{{ row.uppervalue }})</div>
+              <!--            ~褰撳彧鏈変笅闄愬�兼椂      -->
+              <div v-else-if="row.lowervalue">({{ row.lowervalue }}~)</div>
+
+              <div v-else>/</div>
+
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            v-for="(item,index) in dialogTableArrayCol"
+            :key="item"
+            :prop="(index+1)+'/'+ dialogTableNumberCol"
+            :label="'绗�'+(index+1)+'浠�'"
+            show-tooltip-when-overflow
+            min-width="100"
+          >
+            <template slot-scope="{row}">
+              <div style="display: flex;align-items: center">
+                <i
+                  :class="row.check_result==='OK'?'el-icon-success':'el-icon-error'"
+                  :style="{color:row.check_result==='OK'?$store.state.settings.theme:'red'}"
+                  style="margin-right: 2px"
+                />
+                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}
+              </div>
+
+              <!--            &lt;!&ndash;        ~褰撲笁涓�奸兘鏈�    &ndash;&gt;-->
+              <!--            <div v-if="row.standvalue&&row.uppervalue&&row.lowervalue&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])>=parseFloat(row.lowervalue)&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])<=parseFloat(row.uppervalue)">-->
+              <!--              &lt;!&ndash;            <div v-if="row[(index + 1) + '/' + dialogTableNumberCol]>=row.lowervalue&&row[(index + 1) + '/' + dialogTableNumberCol]<=row.uppervalue">&ndash;&gt;-->
+              <!--              <div style="display: flex;align-items: center">-->
+              <!--                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
+              <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
+              <!--              </div>-->
+              <!--            </div>-->
+
+              <!--            &lt;!&ndash;            ~褰撳彧鏈夋爣鍑嗗�煎拰涓婇檺鍊兼椂  &ndash;&gt;-->
+              <!--            <div v-else-if="row.standvalue&&row.uppervalue&&row.lowervalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])<=parseFloat(row.uppervalue)">-->
+              <!--              <div style="display: flex;align-items: center">-->
+              <!--                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
+              <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
+              <!--              </div>-->
+              <!--            </div>-->
+              <!--            &lt;!&ndash;            ~褰撳彧鏈夋爣鍑嗗�煎拰涓嬮檺鍊兼椂&ndash;&gt;-->
+              <!--            <div v-else-if="row.standvalue&&row.lowervalue&&row.uppervalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])>=parseFloat(row.lowervalue)">-->
+              <!--              <div style="display: flex;align-items: center">-->
+              <!--                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
+              <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
+              <!--              </div>-->
+              <!--            </div>-->
+
+              <!--            &lt;!&ndash;            ~褰撳彧鏈変笂闄愬�煎拰涓嬮檺鍊兼椂&ndash;&gt;-->
+              <!--            <div v-else-if="row.uppervalue&&row.lowervalue&&row.standvalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])>=parseFloat(row.lowervalue)&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])<=parseFloat(row.uppervalue)">-->
+              <!--              <div style="display: flex;align-items: center">-->
+              <!--                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
+              <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
+              <!--              </div>-->
+              <!--            </div>-->
+              <!--            &lt;!&ndash;            ~褰撳彧鏈夋爣鍑嗗�兼椂     &ndash;&gt;-->
+              <!--            <div v-else-if="row.standvalue&&row.uppervalue===''&&row.lowervalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])===parseFloat(row.standvalue)">-->
+              <!--              <div style="display: flex;align-items: center">-->
+              <!--                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
+              <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
+              <!--              </div>-->
+              <!--            </div>-->
+              <!--            &lt;!&ndash;            ~褰撳彧鏈変笂闄愬�兼椂       &ndash;&gt;-->
+              <!--            <div v-else-if="row.uppervalue&&row.lowervalue===''&&row.standvalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])<=parseFloat(row.uppervalue)">-->
+              <!--              <div style="display: flex;align-items: center">-->
+              <!--                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
+              <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
+              <!--              </div>-->
+              <!--            </div>-->
+
+              <!--            &lt;!&ndash;            ~褰撳彧鏈変笅闄愬�兼椂      &ndash;&gt;-->
+              <!--            <div v-else-if="row.lowervalue&& row.uppervalue===''&&row.standvalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])>=parseFloat(row.lowervalue)">-->
+              <!--              <div style="display: flex;align-items: center">-->
+              <!--                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
+              <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
+              <!--              </div></div>-->
+
+              <!--            <div v-else>-->
+              <!--              <div style="display: flex;align-items: center">-->
+              <!--                <i class="el-icon-error" style="color: red;margin-right: 2px" />-->
+              <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
+              <!--              </div>-->
+              <!--            </div>-->
+
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <div class="footerButton">
+          <!--          <el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>-->
+          <!--          <el-button v-waves type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>-->
+          <el-button v-waves @click="dialogVisibleBack">杩� 鍥�</el-button>
+        </div>
+      </span>
+    </el-dialog>
+
+    <!--瀵煎叆缁勪欢-->
+    <import-picker
+      ref="importPickerFunc"
+      class="importPickerClass"
+      :shows.sync="shows"
+      :title="title_value"
+      :colos="colos"
+      :code="code"
+    />
+
+  </div>
+</template>
 
 <script>
+import Pagination from '@/components/Pagination'
+import { AddUpdateOrganization, DeleteOrganization } from '@/api/basicSettings'
+import { getCookie } from '@/utils/auth'
+import ImportPicker from '@/components/ImportPicker'
+import { StepCheckTableOutExcel, StepCheckTableSearch, StepCheckTableSubSearch } from '@/api/QualityManagement'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
+import TableColumnSettings from '@/components/TableColumnSettings'
+
+const SER_HZ = /^[\u4e00-\u9fa5]+$/
 export default {
-  name: 'ProcessCheckRecord'
+  name: 'Zzjg',
+  components: {
+    Pagination, ImportPicker, TableColumnSettings
+  },
+  directives: { elDragDialog, waves },
+  data() {
+    return {
+      mouseHoverType: 'mouseout',
+      isExpandForm: false,
+      mainHeight: 0,
+      tableHeight: 0,
+      form: {
+        wocode: '', // 宸ュ崟缂栧彿
+        partcode: '', // 浜у搧缂栫爜
+        partname: '', // 浜у搧鍚嶇О
+        partapec: '', // 浜у搧瑙勬牸
+        stepname: '', // 宸ュ簭鍚嶇О
+        standname: '', // 鏍囧噯鍚嶇О
+        checktype: '', // 妫�楠岀被鍨�
+        checkresult: '', // 妫�楠岀被鍨�
+        prop: 'lm_date', // 鎺掑簭瀛楁
+        order: 'desc', // 鎺掑簭瀛楁
+        page: 1, // 绗嚑椤�
+        rows: 20 // 姣忛〉澶氬皯鏉�
+      },
+      checktypeArr: [
+        { code: 'InCheck', name: '鍏ュ巶妫�楠�' },
+        { code: 'OutCheck', name: '鍑哄巶妫�楠�' },
+        { code: 'FirstCheck', name: '棣栨' },
+        { code: 'PatroCheck', name: '宸℃' },
+        { code: 'EndCheck', name: '瀹屽伐妫�' }
+      ],
+      checkresultArr: [
+        { code: 'OK', name: '鍚堟牸' },
+        { code: 'NG', name: '涓嶈壇' }
+      ],
+
+      total: 10,
+      tableData: [],
+      tableColumnSettingsArray: [
+        { minWidth: 50, width: false, prop: 'id', label: 'id', id: 1, show: false, fixed: false, sortable: false }, // 闅愯棌鍒�  show: false闅愯棌锛宼rue鏄剧ず
+        { minWidth: 25, width: 50, prop: 'rowNum', label: '搴忓彿', id: 2, show: true, fixed: 'left', sortable: false }, // custom
+        {
+          minWidth: 160,
+          width: false,
+          prop: 'wo_code',
+          label: '宸ュ崟缂栧彿',
+          id: 3,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'partcode',
+          label: '浜у搧缂栫爜',
+          id: 4,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'partname',
+          label: '浜у搧鍚嶇О',
+          id: 5,
+          show: true,
+          fixed: false,
+          sortable: true
+        }, {
+          minWidth: 110,
+          width: false,
+          prop: 'partspec',
+          label: '浜у搧瑙勬牸',
+          id: 6,
+          show: true,
+          fixed: false,
+          sortable: true
+        }, {
+          minWidth: 110,
+          width: false,
+          prop: 'step_code',
+          label: '宸ュ簭缂栫爜',
+          id: 7,
+          show: true,
+          fixed: false,
+          sortable: true
+        }, {
+          minWidth: 110,
+          width: false,
+          prop: 'stepname',
+          label: '宸ュ簭鍚嶇О',
+          id: 8,
+          show: true,
+          fixed: false,
+          sortable: true
+        }, {
+          minWidth: 110,
+          width: false,
+          prop: 'checkstaned_code',
+          label: '鏍囧噯缂栫爜',
+          id: 9,
+          show: true,
+          fixed: false,
+          sortable: true
+        }, {
+          minWidth: 110,
+          width: false,
+          prop: 'checkstaned_name',
+          label: '鏍囧噯鍚嶇О',
+          id: 10,
+          show: true,
+          fixed: false,
+          sortable: true
+        }, {
+          minWidth: 110,
+          width: false,
+          prop: 'check_type',
+          label: '妫�楠岀被鍨�',
+          id: 11,
+          show: true,
+          fixed: false,
+          sortable: true
+        }, {
+          minWidth: 110,
+          width: false,
+          prop: 'check_result',
+          label: '妫�楠岀粨鏋�',
+          id: 12,
+          show: true,
+          fixed: false,
+          sortable: true
+        }, {
+          minWidth: 110,
+          width: false,
+          prop: 'check_descr',
+          label: '妫�楠屽娉�',
+          id: 13,
+          show: true,
+          fixed: false,
+          sortable: true
+        }, {
+          minWidth: 110,
+          width: false,
+          prop: 'check_qty',
+          label: '妫�楠屾暟閲�',
+          id: 14,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'lm_user',
+          label: '妫�楠屼汉鍛�',
+          id: 15,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 160,
+          width: false,
+          prop: 'lm_date',
+          label: '妫�楠屾椂闂�',
+          id: 16,
+          show: true,
+          fixed: false,
+          sortable: true
+        }
+      ],
+      tableTimeStampKey: new Date().getTime(), // 琛ㄦ牸key
+      dialogVisible: false,
+      tableDataDialog: [],
+      title_value: '鏁版嵁瀵煎叆 / 鐐规閮ㄤ綅',
+      code: '4',
+      shows: false,
+      dialogTableNumberCol: 0, // 瀵硅瘽妗嗗姩鎬佺殑鍒楁暟
+      dialogTableArrayCol: []// 瀵硅瘽妗嗗姩鎬佺殑鏁扮粍
+
+    }
+  },
+  watch: {
+    shows() {
+      if (!this.shows) {
+        this.getStepCheckTableSearch()
+      }
+    }
+  },
+  created() {
+    this.getStepCheckTableSearch()
+  },
+  mounted() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+  },
+  methods: {
+    tableColumnUpdate(val, isCopyTrue) {
+      if (isCopyTrue) {
+        this.tableColumnSettingsArray = val
+      }
+      this.tableTimeStampKey = new Date().getTime()
+      this.$refs.tableDataRef.doLayout()
+    },
+    async getStepCheckTableSearch() {
+      const res = await StepCheckTableSearch(this.form)
+      this.tableData = res.data
+      this.total = res.count
+    },
+    // 鎺掑簭鏀瑰彉鏃�
+    sortChange({ column, prop, order }) {
+      if (order === 'descending') {
+        order = 'desc'
+      } else if (order === 'ascending') {
+        order = 'asc'
+      } else {
+        order = 'desc'
+      }
+      this.form.order = order
+      this.form.prop = prop
+      this.getStepCheckTableSearch()
+    },
+    // 鏌ヨ
+    search() {
+      this.getStepCheckTableSearch()
+    },
+    // 瀵煎叆鎸夐挳
+    upload() {
+      this.shows = true
+      this.$refs.importPickerFunc.newDataFunc()
+    },
+    colos() {
+      this.shows = false
+    },
+    // 閲嶇疆
+    reset() {
+      this.form.wocode = '', // 宸ュ崟缂栧彿
+      this.form.partcode = '', // 浜у搧缂栫爜
+      this.form.partname = '', // 浜у搧鍚嶇О
+      this.form.partapec = '', // 浜у搧瑙勬牸
+      this.form.stepname = '', // 宸ュ簭鍚嶇О
+      this.form.standname = '', // 鏍囧噯鍚嶇О
+      this.form.checktype = '', // 妫�楠岀被鍨�
+      this.form.checkresult = '', // 妫�楠岀被鍨�
+      this.getStepCheckTableSearch()
+    },
+
+    async check(row) {
+      // this.operation = operation
+
+      this.dialogVisible = true
+      console.log(row, 1)
+      const res = await StepCheckTableSubSearch({ id: row.id })
+      this.tableDataDialog = res.data
+
+      this.tableDataDialog.forEach((item, index) => {
+        for (const it in item) {
+          if (it.indexOf('/') !== -1) {
+            const i = it.split('/')[1]
+            this.dialogTableNumberCol = i
+          }
+        }
+      })
+
+      this.dialogTableArrayCol = []
+      for (let i = 0; i < this.dialogTableNumberCol; i++) {
+        this.dialogTableArrayCol.push(i)
+      }
+
+      this.$nextTick(() => {
+        this.$refs.tableDataRef2.doLayout()
+      })
+    },
+
+    // 鏂板鎸夐挳
+    add(operation) {
+      this.operation = operation
+      this.dialogVisible = true
+    },
+    // 淇敼鎸夐挳
+    edit(operation, row) {
+      this.operation = operation
+      this.dialogVisible = true
+
+      this.$nextTick(() => {
+        this.dialogForm.OrgCode = row.org_code
+        this.dialogForm.OrgName = row.org_name
+        this.dialogForm.SupUnit = row.parent_id
+      })
+    },
+    // 鍒犻櫎鎸夐挳
+    async del(row) {
+      this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        DeleteOrganization({ orgid: row.code }).then(res => {
+          if (res.code === '200') {
+            this.$message.success('鍒犻櫎鎴愬姛!')
+            if (this.form.page > 1 && this.tableData.length === 1) {
+              this.form.page--
+            }
+            this.getStepCheckTableSearch()
+          }
+        })
+      }).catch(() => {
+        this.$message.info('宸插彇娑堝垹闄�')
+      })
+    },
+    // 瀵硅瘽妗嗗叧闂簨浠�
+    handleClose() {
+      this.tableDataDialog = []
+    },
+    // 瀵硅瘽妗嗗彇娑�
+    dialogVisibleCancel() {
+      this.dialogVisible = false
+    },
+    // 瀵硅瘽妗嗙‘璁�
+    dialogVisibleConfirm() {
+      this.$refs.dialogForm.validate(valid => {
+        if (valid) {
+          const data = {
+            OrganCode: this.dialogForm.OrgCode,
+            OrganName: this.dialogForm.OrgName,
+            OperType: this.operation === 'add' ? 'Add' : 'Update',
+            Operator: getCookie('admin')
+          }
+          AddUpdateOrganization(data).then(res => {
+            if (res.code === '200') {
+              this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+              this.dialogVisible = false
+              this.getStepCheckTableSearch()
+            } else {
+              this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+            }
+          })
+        }
+      })
+    },
+    // 鑾峰彇椤甸潰楂樺害
+    getHeight() {
+      this.$nextTick(() => {
+        this.mainHeight = window.innerHeight - 85
+        this.tableHeight = this.mainHeight - 250
+        this.$refs.tableDataRef.doLayout()
+      })
+    },
+    tableRowClassName({ row, rowIndex }) {
+      return 'custom-row'
+    },
+    async  download() {
+      const { data: res } = await StepCheckTableOutExcel(this.form)
+      window.location.href = res
+    },
+    dialogVisibleBack() {
+      this.dialogVisible = false
+    }
+  }
 }
 </script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/qualityManager/qualityPlaning.vue b/src/views/qualityManager/qualityPlaning.vue
index a08b4e3..c217f53 100644
--- a/src/views/qualityManager/qualityPlaning.vue
+++ b/src/views/qualityManager/qualityPlaning.vue
@@ -1,11 +1,1295 @@
-<template />
+<template>
+  <div>
+    <div class="body" :style="{height:mainHeight+'px'}">
+      <div class="bodyTopButtonGroup" style="justify-content: space-between">
+        <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+      </div>
+
+      <div class="bodyTopFormGroup">
+        <el-form
+          ref="form"
+          :model="form"
+          label-width="100px"
+          inline
+          style="display: flex;"
+        >
+          <div class="elForm">
+            <el-form-item label="璐ㄦ鏂规缂栫爜" style=" display: flex;">
+              <el-input v-model="form.qualityinsptcode" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+            <el-form-item label="璐ㄦ鏂规鍚嶇О" style=" display: flex;">
+              <el-input v-model="form.qualityinsptname" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+            <el-form-item label="鏈夋晥鐘舵��" style=" display: flex;">
+              <el-select v-model="form.status" style="width: 200px" placeholder="璇烽�夋嫨">
+                <el-option
+                  v-for="item in whetherOrNot"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="璐ㄦ绫诲瀷" style=" display: flex;">
+              <el-select v-model="form.checktype" style="width: 200px" placeholder="璇烽�夋嫨">
+                <el-option
+                  v-for="item in checktypeArr"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item v-show="isExpandForm" label="鎶芥牱鏂瑰紡" style=" display: flex;">
+              <el-select v-model="form.sampltype" style="width: 200px" placeholder="璇烽�夋嫨">
+                <el-option
+                  v-for="item in sampltypeArr"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item v-show="isExpandForm" label="閫傜敤瀵硅薄" style=" display: flex;">
+              <el-select v-model="form.suitobject" style="width: 200px" placeholder="璇烽�夋嫨">
+                <el-option
+                  v-for="item in suitobjectArr"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+          </div>
+          <div
+            class="bodySearchReset"
+            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+          >
+            <el-button v-waves type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+            <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+          </div>
+        </el-form>
+        <div
+          class="bodyTopFormExpand"
+        >
+          <svg-icon
+            v-show="mouseHoverType==='mouseout'"
+            style="cursor: pointer"
+            :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
+            @mouseenter="mouseHoverType=$event.type"
+          />
+          <svg-icon
+            v-show="mouseHoverType==='mouseenter'"
+            style="cursor: pointer"
+            :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
+            @click="isExpandForm=!isExpandForm"
+            @mouseout="mouseHoverType=$event.type"
+          />
+        </div>
+      </div>
+
+      <div class="elTableDiv">
+        <!--        <TableColumnSettings-->
+        <!--          :list1="tableColumnSettingsArray"-->
+        <!--          @tableColumnUpdate="tableColumnUpdate"-->
+        <!--        />-->
+        <el-table
+          :key="tableTimeStampKey"
+          ref="tableDataRef"
+          class="tableFixed"
+          :data="tableData"
+          :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
+          border
+          :row-class-name="tableRowClassName"
+          :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
+          highlight-current-row
+          :header-cell-style="this.$headerCellStyle"
+          :cell-style="this.$cellStyle"
+          @sort-change="sortChange"
+        >
+          <!--          <el-table-column-->
+          <!--            prop="RowNum"-->
+          <!--            width="50"-->
+          <!--            fixed-->
+          <!--            label="搴忓彿"-->
+          <!--          />-->
+          <!--          <el-table-column-->
+          <!--            prop="code"-->
+          <!--            label="璐ㄦ鏂规缂栫爜"-->
+          <!--            sortable="custom"-->
+          <!--          />-->
+          <!--          <el-table-column-->
+          <!--            prop="name"-->
+          <!--            label="璐ㄦ鏂规鍚嶇О"-->
+          <!--            sortable="custom"-->
+          <!--          />-->
+          <!--          <el-table-column-->
+          <!--            prop="status"-->
+          <!--            label="鏈夋晥鐘舵��"-->
+          <!--            sortable="custom"-->
+          <!--          >-->
+          <!--            <template slot-scope="{row}">-->
+          <!--              <div v-if="row.status==='Y'"><i-->
+          <!--                class="el-icon-success"-->
+          <!--                :style="{color:$store.state.settings.theme}"-->
+          <!--                style="margin-right:5px"-->
+          <!--              />鏄�-->
+          <!--              </div>-->
+          <!--              <div v-else-if="row.status==='N'"><i class="el-icon-info" style="margin-right: 5px" />鍚�</div>-->
+          <!--              <div v-else>/</div>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            prop="checktype"-->
+          <!--            label="璐ㄦ绫诲瀷"-->
+          <!--            sortable="custom"-->
+          <!--          >-->
+          <!--            <template slot-scope="{row}">-->
+          <!--              <div v-if="row.checktype">{{ checktypeArr.find(i => i.code === row.checktype).name }}</div>-->
+          <!--              <div v-else>/</div>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            prop="sampmethod"-->
+          <!--            label="鎶芥牱鏂瑰紡"-->
+          <!--            sortable="custom"-->
+          <!--          >-->
+          <!--            <template slot-scope="{row}">-->
+          <!--              <div v-if="row.sampmethod">{{ sampltypeArr.find(i => i.code === row.sampmethod).name }}</div>-->
+          <!--              <div v-else>/</div>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            prop="suitobject"-->
+          <!--            label="閫傜敤瀵硅薄"-->
+          <!--            sortable="custom"-->
+          <!--          >-->
+          <!--            <template slot-scope="{row}">-->
+          <!--              <div v-if="row.suitobject">{{ suitobjectArr.find(i => i.code === row.suitobject).name }}</div>-->
+          <!--              <div v-else>/</div>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+
+          <!--          <el-table-column-->
+          <!--            prop="username"-->
+          <!--            label="鍒涘缓浜哄憳"-->
+          <!--            sortable="custom"-->
+          <!--          />-->
+          <!--          <el-table-column-->
+          <!--            prop="lm_date"-->
+          <!--            label="鍒涘缓鏃堕棿"-->
+          <!--            width="160"-->
+          <!--            sortable="custom"-->
+          <!--          />-->
+
+          <el-table-column
+            v-for="item in tableColumnSettingsArray"
+            v-if="item.show"
+            :key="item.id"
+            :sortable="item.sortable"
+            :prop="item.prop"
+            :min-width="item.minWidth"
+            :label="item.label"
+            :width="item.width"
+            show-tooltip-when-overflow
+            :fixed="item.fixed?(item.fixed==='left'?'left':'right'):false"
+          >
+            <template slot-scope="{row}">
+              <div v-if="!row[item.prop]">/</div>
+              <div v-else-if="item.prop==='checktype'">
+                {{ checktypeArr.find(i => i.code === row[item.prop]).name }}
+              </div>
+              <div v-else-if="item.prop==='sampmethod'">
+                {{ sampltypeArr.find(i => i.code === row[item.prop]).name }}
+              </div>
+              <!--              閫傜敤瀵硅薄-->
+              <div v-else-if="item.prop==='suitobject'">
+                {{ suitobjectArr.find(i => i.code === row.suitobject).name }}
+              </div>
+              <div v-else-if="item.prop==='status'">
+                <div v-if="row.status==='Y'"><i
+                  class="el-icon-success"
+                  :style="{color:$store.state.settings.theme}"
+                  style="margin-right:5px"
+                />鏄�
+                </div>
+                <div v-else-if="row.status==='N'"><i class="el-icon-info" style="margin-right: 5px" />鍚�</div>
+                <div v-else>/</div>
+              </div>
+              <div v-else>{{ row[item.prop] }}</div>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            label="鎿嶄綔"
+            width="120"
+            fixed="right"
+          >
+            <template slot-scope="{row}">
+              <div class="operationClass">
+                <el-tooltip class="item" effect="dark" content="鏌ョ湅" placement="top">
+                  <i
+                    class="el-icon-view"
+                    :style="{color:$store.state.settings.theme}"
+                    style="margin-right:15px;cursor: pointer;"
+                    @click="check('check',row)"
+                  />
+                </el-tooltip>
+                <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+                  <i
+                    class="el-icon-edit-outline"
+                    :style="{color:$store.state.settings.theme}"
+                    @click="edit('edit',row)"
+                  />
+                </el-tooltip>
+                <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
+                  <i class="el-icon-delete" :style="{color:$store.state.settings.theme}" @click="del(row)" />
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <!--鍒嗛〉-->
+      <pagination
+        :total="total"
+        :page.sync="form.page"
+        :limit.sync="form.rows"
+        align="right"
+        layout="total,prev, pager, next,sizes"
+        popper-class="select_bottom"
+        @pagination="getQualityInspectionSearch"
+      />
+    </div>
+
+    <el-dialog
+      v-el-drag-dialog
+      :title="operation==='add'?'鏂板':operation==='check'?'鏌ョ湅':'缂栬緫'"
+      :visible.sync="dialogVisible"
+      width="1260px"
+      :close-on-click-modal="false"
+      top="5vh"
+      @closed="handleClose"
+      @close="handleClose"
+    >
+
+      <!--      <div>-->
+      <!--        <i class="el-icon-s-comment" :style="{color:$store.state.settings.theme}" style="margin: -20px 10px 20px 0" />鍩虹璧勬枡锛�-->
+      <!--      </div>-->
+      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="110px">
+        <el-form-item label="璐ㄦ鏂规缂栫爜" prop="qualityinsptcode">
+          <el-input v-model="dialogForm.qualityinsptcode" :disabled="operation!=='add'" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="璐ㄦ鏂规鍚嶇О" prop="qualityinsptname">
+          <el-input v-model="dialogForm.qualityinsptname" style="width: 200px" />
+        </el-form-item>
+        <br>
+        <el-form-item prop="status" label="鏈夋晥鐘舵��">
+          <el-select
+            v-model="dialogForm.status"
+            style="width: 200px"
+            placeholder="璇烽�夋嫨"
+            :popper-append-to-body="false"
+          >
+            <el-option
+              v-for="item in whetherOrNot"
+              :key="item.code"
+              :label="item.name"
+              :value="item.code"
+            />
+          </el-select>
+        </el-form-item>
+        <br>
+        <el-form-item prop="checktype" label="璐ㄦ绫诲瀷">
+          <el-radio-group v-model="dialogForm.checktype">
+            <!--            <el-radio label="InCheck">鍏ュ巶妫�楠�</el-radio>-->
+            <!--            <el-radio label="OutCheck">鍑哄巶妫�楠�</el-radio>-->
+            <el-radio label="FirstCheck">棣栨妫�楠�</el-radio>
+            <el-radio label="PatroCheck">宸℃</el-radio>
+            <el-radio label="EndCheck">瀹屽伐妫�</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <br>
+        <el-form-item prop="sampmethod" label="鎶芥牱鏂瑰紡">
+          <el-radio-group v-model="dialogForm.sampmethod" style="width: 200px;">
+            <el-radio label="FIXED">鍥烘椂鎶芥</el-radio>
+            <el-radio label="SCARE">姣斾緥鎶芥</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item v-if="dialogForm.sampmethod==='FIXED'" label="鏍锋湰鏁伴噺" prop="sampnum">
+          <el-input v-model="dialogForm.sampnum" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 200px" />
+        </el-form-item>
+        <el-form-item v-if="dialogForm.sampmethod==='SCARE'" label="鎶芥姣斾緥" prop="sampscale">
+          <el-input v-model="dialogForm.sampscale" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 180px" />
+          %
+        </el-form-item>
+        <br>
+        <el-form-item prop="suitobject" label="閫傜敤瀵硅薄">
+          <el-radio-group v-model="dialogForm.suitobject" style="width: 200px;" @change="suitobjectChange">
+            <el-radio label="PY">鐗╂枡绫诲埆</el-radio>
+            <el-radio label="P">鐗╂枡</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item
+          prop="suitpart"
+          :label="dialogForm.suitobject==='P'?'閫傜敤鐗╂枡':'閫傜敤鐗╂枡绫诲埆'"
+        >
+          <el-select
+            v-model="dialogForm.suitpart"
+            style="width: 200px"
+            multiple
+            filterable
+            collapse-tags
+            placeholder="璇烽�夋嫨"
+            :popper-append-to-body="false"
+          >
+            <el-option
+              v-for="item in PartSelectArr"
+              v-if="dialogForm.suitobject==='P'"
+              :key="item.partcode"
+              :label="item.partcode +' / '+ item.partname"
+              :value="item.partcode"
+            />
+            <el-option
+              v-for="item in StockTypeSelectArr"
+              v-if="dialogForm.suitobject==='PY'"
+              :key="item.code"
+              :label="item.code+' / '+item.name"
+              :value="item.code"
+            />
+          </el-select>
+        </el-form-item>
+        <br>
+        <el-form-item
+          label="宸ュ簭鍚嶇О"
+          prop="stepcode"
+        >
+          <el-select
+            v-model="dialogForm.stepcode"
+            style="width: 200px"
+            filterable
+            placeholder="璇烽�夋嫨"
+            :popper-append-to-body="false"
+          >
+            <el-option
+              v-for="item in StepSelectArr"
+              :key="item.stepcode"
+              :label="item.stepname"
+              :value="item.stepcode"
+            />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="妫�楠屾柟妗堟弿杩�">
+          <el-input v-model="dialogForm.descr" type="textarea" :autosize="{ minRows: 2 }" />
+        </el-form-item>
+      </el-form>
+
+      <div style="display: flex;align-items: center;margin-bottom: 10px;">
+        <div>
+          <i
+            class="el-icon-s-operation"
+            :style="{color:$store.state.settings.theme}"
+            style="margin:0 10px 0 0px;"
+          />
+        </div>
+        <div>璐ㄦ鍒楄〃锛�</div>
+        <el-button
+          v-if="operation!=='check'"
+          v-waves
+          type="primary"
+          style="margin-left: 20px;"
+          icon="el-icon-circle-plus-outline"
+          @click="addZjlb"
+        >鏂板
+        </el-button>
+      </div>
+
+      <el-table
+        ref="tableDataRef2"
+        class="tableFixed"
+        :data="checkitem"
+        height="250"
+        style="height:250px"
+        border
+        :row-class-name="tableRowClassName"
+        highlight-current-row
+        :header-cell-style="this.$headerCellStyle"
+        :cell-style="this.$cellStyle"
+      >
+        <el-table-column
+          type="index"
+          width="50"
+          fixed
+          label="搴忓彿"
+        />
+        <!--        <el-table-column-->
+        <!--          prop="jyxmbm"-->
+        <!--          width="105"-->
+        <!--          label="妫�楠岄」鐩紪鐮�"-->
+        <!--        >-->
+        <!--          <template slot-scope="{row}">-->
+        <!--            <el-select-->
+        <!--              v-if="row.isVisible===1"-->
+        <!--              v-model="row.jyxmbm"-->
+        <!--              filterable-->
+        <!--              placeholder="璇烽�夋嫨"-->
+        <!--              @change="val=>tableChange(val,row)"-->
+        <!--            >-->
+        <!--              <el-option-->
+        <!--                v-for="item in PartSelectArr"-->
+        <!--                :key="item.partname"-->
+        <!--                :label="item.partcode"-->
+        <!--                :value="item.partname"-->
+        <!--              />-->
+        <!--            </el-select>-->
+        <!--            <div v-if="row.isVisible===0">{{ row.jyxmbm }}</div>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column-->
+        <!--          prop="jyxmmc"-->
+        <!--          width="105"-->
+        <!--          label="妫�楠岄」鐩悕绉�"-->
+        <!--        >-->
+        <!--          <template slot-scope="{row}">-->
+        <!--            <el-select-->
+        <!--              v-if="row.isVisible===1"-->
+        <!--              v-model="row.jyxmmc"-->
+        <!--              filterable-->
+        <!--              placeholder="璇烽�夋嫨"-->
+        <!--              @change="val=>tableChange(val,row)"-->
+        <!--            >-->
+        <!--              <el-option-->
+        <!--                v-for="item in PartSelectArr"-->
+        <!--                :key="item.partname"-->
+        <!--                :label="item.partcode"-->
+        <!--                :value="item.partname"-->
+        <!--              />-->
+        <!--            </el-select>-->
+        <!--            <div v-if="row.isVisible===0">{{ row.jyxmmc }}</div>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+
+        <el-table-column
+          prop="stepcheckitem_code"
+          width="250"
+          label="妫�楠岄」鐩� / 缂栫爜"
+        >
+          <template slot-scope="{row}">
+            <el-select
+              v-if="row.isVisible===1"
+              v-model="row.stepcheckitem_code"
+              filterable
+              placeholder="璇烽�夋嫨"
+              style="width: 100%;"
+            >
+              <!--              @change="val=>tableChange(val,row)"-->
+              <el-option
+                v-for="item in CheckItemSelectArr"
+                :key="item.code"
+                :label="item.name"
+                :value="item.code"
+              />
+            </el-select>
+            <div v-else>{{
+              CheckItemSelectAllArr.find(i => i.code === row.stepcheckitem_code).name
+            }}
+            </div>
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          prop="required"
+          width="85"
+          label="鏄惁蹇呭~"
+        >
+          <template slot-scope="{row}">
+            <el-select
+              v-if="row.isVisible===1"
+              v-model="row.required"
+              filterable
+              placeholder="璇烽�夋嫨"
+            >
+              <el-option
+                v-for="item in whetherOrNot"
+                :key="item.code"
+                :label="item.name"
+                :value="item.code"
+              />
+            </el-select>
+            <div v-else>{{ row.required === 'Y' ? '鏄�' : '鍚�' }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="numberjudge"
+          width="85"
+          label="鏁板�煎垽瀹�"
+        >
+          <template slot-scope="{row}">
+            <el-select
+              v-if="row.isVisible===1"
+              v-model="row.numberjudge"
+              filterable
+              placeholder="璇烽�夋嫨"
+              @change="val=>szpdChange(val,row)"
+            >
+              <el-option
+                v-for="item in whetherOrNot"
+                :key="item.code"
+                :label="item.name"
+                :value="item.code"
+              />
+            </el-select>
+            <div v-else>{{ row.numberjudge === 'Y' ? '鏄�' : '鍚�' }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="unit"
+          label="鍗曚綅"
+        >
+          <template slot-scope="{row}">
+            <!--            <el-select-->
+            <!--              v-if="row.isVisible===1"-->
+            <!--              v-model="row.unit"-->
+            <!--              filterable-->
+            <!--              :disabled="row.numberjudge==='N'"-->
+            <!--              placeholder="璇烽�夋嫨"-->
+            <!--            >-->
+            <!--              <el-option-->
+            <!--                v-for="item in UomSelectArr"-->
+            <!--                :key="item.code"-->
+            <!--                :label="item.name"-->
+            <!--                :value="item.code"-->
+            <!--              />-->
+            <!--            </el-select>-->
+            <!--            <div v-if="row.isVisible===0">{{-->
+            <!--                row.numberjudge === 'Y' ? UomSelectArr.find(i => i.code === row.unit).name : '/'-->
+            <!--              }}-->
+            <!--            </div>-->
+            <el-input
+              v-if="row.isVisible===1"
+              v-model="row.unit"
+              placeholder="璇烽�夋嫨"
+              :disabled="row.numberjudge==='N'"
+            />
+            <div v-else>{{ row.unit ? row.unit : '/' }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="decimalnum"
+          width="85"
+          label="灏忔暟浣嶆暟"
+        >
+          <template slot-scope="{row}">
+            <!--            <el-select-->
+            <!--              v-if="row.isVisible===1"-->
+            <!--              v-model="row.decimalnum"-->
+            <!--              filterable-->
+            <!--              placeholder="璇烽�夋嫨"-->
+            <!--            >-->
+            <!--              <el-option-->
+            <!--                v-for="item in PartSelectArr"-->
+            <!--                :key="item.partname"-->
+            <!--                :label="item.partcode"-->
+            <!--                :value="item.partname"-->
+            <!--              />-->
+            <!--            </el-select>-->
+            <el-input
+              v-if="row.isVisible===1"
+              v-model="row.decimalnum"
+              :disabled="row.numberjudge==='N'"
+              oninput="value=value.replace(/[^0-9]/g,'')"
+              placeholder="璇疯緭鍏�"
+            />
+            <div v-else>{{ row.numberjudge === 'Y' ? row.decimalnum : '/' }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="standvalue"
+          label="鏍囧噯鍊�"
+        >
+          <template slot-scope="{row}">
+            <el-input
+              v-if="row.isVisible===1"
+              v-model="row.standvalue"
+              :disabled="row.numberjudge==='N'"
+              oninput="value=value.replace(/[^0-9.]/g,'')"
+              placeholder="璇疯緭鍏�"
+            />
+            <div v-else>{{ row.standvalue ? row.standvalue : '/' }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="uppervalue"
+          label="涓婇檺鍊�"
+        >
+          <template slot-scope="{row}">
+            <el-input
+              v-if="row.isVisible===1"
+              v-model="row.uppervalue"
+              :disabled="row.numberjudge==='N'"
+              oninput="value=value.replace(/[^0-9.]/g,'')"
+              placeholder="璇疯緭鍏�"
+            />
+            <div v-else>{{ row.uppervalue ? row.uppervalue : '/' }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="lowervalue"
+          label="涓嬮檺鍊�"
+        >
+          <template slot-scope="{row}">
+            <el-input
+              v-if="row.isVisible===1"
+              v-model="row.lowervalue"
+              :disabled="row.numberjudge==='N'"
+              oninput="value=value.replace(/[^0-9.]/g,'')"
+              placeholder="璇疯緭鍏�"
+            />
+            <div v-else>{{ row.lowervalue ? row.lowervalue : '/' }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="stepcheckitem_desc"
+          label="鎻忚堪"
+          show-tooltip-when-overflow
+        >
+          <template slot-scope="{row}">
+            <el-input
+              v-if="row.isVisible===1"
+              v-model="row.stepcheckitem_desc"
+              placeholder="璇疯緭鍏�"
+            />
+            <div v-else>{{ row.stepcheckitem_desc ? row.stepcheckitem_desc : '/' }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-if="operation!=='check'"
+          label="鎿嶄綔"
+          width="120"
+          fixed="right"
+        >
+          <template slot-scope="{row}">
+            <div class="operationClass">
+              <el-button v-if="row.isVisible===1" v-waves type="text" @click="saveZjlbRow(row)">纭</el-button>
+              <el-button v-if="row.isVisible===1&&isCancel" v-waves type="text" @click="cancelZjlbRow(row)">鍙栨秷
+              </el-button>
+              <el-button v-if="row.isVisible!==1" v-waves type="text" @click="editZjlbRow(row)">缂栬緫</el-button>
+              <el-button v-if="row.isVisible!==1" v-waves type="text" @click="delZjlbRow(row)">鍒犻櫎</el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <span slot="footer" class="dialog-footer">
+        <div class="footerButton">
+          <el-button v-if="operation!=='check'" v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
+          <el-button
+            v-if="operation!=='check'"
+            v-waves
+            :loading="$store.state.app.buttonIsDisabled"
+            :disabled="$store.state.app.buttonIsDisabled"
+            type="primary"
+            @click="dialogVisibleConfirm"
+          >淇� 瀛�</el-button>
+          <el-button v-if="operation==='check'" v-waves @click="dialogVisibleCancel">杩� 鍥�</el-button>
+        </div>
+      </span>
+    </el-dialog>
+
+  </div>
+</template>
 
 <script>
+import Pagination from '@/components/Pagination'
+import { validateCode } from '@/utils/global'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
+import {
+  QualityInspectionAddEditSave,
+  QualityInspectionDelete,
+  QualityInspectionSearch, QualityInspectionSeeEdit, QualityStepCheckItemSelect
+} from '@/api/QualityManagement'
+import TableColumnSettings from '@/components/TableColumnSettings'
+import { PartSelect, TMaterielClassTree } from '@/api/ProductModel'
+import { StepData } from '@/api/GeneralBasicData'
+
 export default {
-  name: 'QualityPlaning'
+  name: 'Zzjg',
+  components: {
+    Pagination, TableColumnSettings
+  },
+  directives: { elDragDialog, waves },
+  data() {
+    return {
+      mouseHoverType: 'mouseout',
+      isExpandForm: false,
+      mainHeight: 0,
+      tableHeight: 0,
+      form: {
+        qualityinsptcode: '', // 璐ㄦ鏂规缂栫爜
+        qualityinsptname: '', // 璐ㄦ鏂规鍚嶇О
+        status: '', // 鏈夋晥鐘舵��
+        checktype: '', // 璐ㄦ绫诲瀷
+        sampltype: '', // 鎶芥牱鏂瑰紡
+        suitobject: '', // 閫傜敤瀵硅薄
+        prop: 'lm_date', // 鎺掑簭瀛楁
+        order: 'desc', // 鎺掑簭瀛楁
+        page: 1, // 绗嚑椤�
+        rows: 20 // 姣忛〉澶氬皯鏉�
+      },
+      checktypeArr: [
+        // { code: 'InCheck', name: '鍏ュ巶妫�楠�' },
+        // { code: 'OutCheck', name: '鍑哄巶妫�楠�' },
+        { code: 'FirstCheck', name: '棣栨' },
+        { code: 'PatroCheck', name: '宸℃' },
+        { code: 'EndCheck', name: '瀹屽伐妫�' }
+      ],
+      sampltypeArr: [
+        { code: 'FIXED', name: '鍥哄畾鎶芥' },
+        { code: 'SCARE', name: '姣斾緥鎶芥' }
+      ],
+      suitobjectArr: [
+        { code: 'P', name: '鐗╂枡' },
+        { code: 'PY', name: '鐗╂枡绫诲瀷' }
+      ],
+      total: 10,
+      tableData: [],
+      tableColumnSettingsArray: [
+        // { minWidth: 50, width: false, prop: 'id', label: 'id', id: 1, show: false, fixed: false, sortable: false }, // 闅愯棌鍒�  show: false闅愯棌锛宼rue鏄剧ず
+        { minWidth: 25, width: 50, prop: 'rowNum', label: '搴忓彿', id: 2, show: true, fixed: 'left', sortable: false }, // custom
+        {
+          minWidth: 130,
+          width: false,
+          prop: 'code',
+          label: '璐ㄦ鏂规缂栫爜',
+          id: 3,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 130,
+          width: false,
+          prop: 'name',
+          label: '璐ㄦ鏂规鍚嶇О',
+          id: 4,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'status',
+          label: '鏈夋晥鐘舵��',
+          id: 5,
+          show: true,
+          fixed: false,
+          sortable: true
+        }, {
+          minWidth: 110,
+          width: false,
+          prop: 'checktype',
+          label: '璐ㄦ绫诲瀷',
+          id: 6,
+          show: true,
+          fixed: false,
+          sortable: true
+        }, {
+          minWidth: 110,
+          width: false,
+          prop: 'sampmethod',
+          label: '鎶芥牱鏂瑰紡',
+          id: 7,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'suitobject',
+          label: '閫傜敤瀵硅薄',
+          id: 8,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: false,
+          width: 110,
+          prop: 'stepcode',
+          label: '宸ュ簭缂栫爜',
+          id: 9,
+          show: false,
+          fixed: false,
+          sortable: true
+        }, {
+          minWidth: 110,
+          width: false,
+          prop: 'stepname',
+          label: '宸ュ簭鍚嶇О',
+          id: 10,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: false,
+          width: 110,
+          prop: 'username',
+          label: '鍒涘缓浜哄憳',
+          id: 11,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: false,
+          width: 160,
+          prop: 'lm_date',
+          label: '鍒涘缓鏃堕棿',
+          id: 12,
+          show: true,
+          fixed: false,
+          sortable: true
+        }
+      ],
+      tableTimeStampKey: new Date().getTime(), // 琛ㄦ牸key
+      dialogVisible: false,
+      dialogForm: {
+        qualityinsptcode: '', // 璐ㄦ鏂规缂栫爜
+        qualityinsptname: '', // 璐ㄦ鏂规鍚嶇О
+        status: 'Y', // 鏈夋晥鐘舵��
+        checktype: 'FirstCheck', // 妫�楠岀被鍨�
+        sampmethod: 'FIXED', // 鎶芥鏂瑰紡
+        sampnum: '', // 鏍锋湰鏁伴噺
+        sampscale: '', // 鎶芥姣斾緥
+        suitobject: 'P', // 閫傜敤瀵硅薄
+        suitpart: [], // 閫傜敤鐗╂枡
+        stepcode: '', // 宸ュ簭
+        descr: '' // /鎻忚堪
+      },
+      operation: '',
+      dialogFormRules: {
+        status: [
+          { required: true, message: '璇疯緭鍏ラ�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
+        ],
+        qualityinsptcode: [
+          { required: true, validator: validateCode, trigger: ['blur', 'change'] }
+        ],
+        qualityinsptname: [
+          { required: true, message: '璇疯緭鍏ヨ川妫�鏂规鍚嶇О', trigger: ['blur', 'change'] }
+        ],
+        checktype: [
+          { required: true, message: '璇烽�夋嫨璐ㄦ鏂瑰紡', trigger: ['blur', 'change'] }
+        ],
+        sampmethod: [
+          { required: true, message: '璇烽�夋嫨鎶芥牱鏂瑰紡', trigger: ['blur', 'change'] }
+        ],
+        sampnum: [
+          { required: true, message: '璇疯緭鍏ユ牱鏈暟閲�', trigger: ['blur', 'change'] }
+        ],
+        sampscale: [
+          { required: true, message: '璇疯緭鍏ユ娊妫�姣斾緥', trigger: ['blur', 'change'] }
+        ],
+        suitobject: [
+          { required: true, message: '璇烽�夋嫨閫傜敤瀵硅薄', trigger: ['blur', 'change'] }
+        ],
+        suitpart: [
+          { required: true, message: '璇烽�夋嫨鐗╂枡鎴栫墿鏂欑被鍒�', trigger: ['blur', 'change'] }
+        ],
+        stepcode: [
+          { required: true, message: '璇烽�夋嫨宸ュ簭鍚嶇О', trigger: ['blur', 'change'] }
+        ]
+      },
+      checkitem: [],
+
+      whetherOrNot: [ // 鏄垨鍚�
+        { code: 'Y', name: '鏄�' },
+        { code: 'N', name: '鍚�' }
+      ],
+
+      PartSelectArr: [], // 鐗╂枡涓嬫媺鏁扮粍
+      StockTypeSelectArr: [], // 鐗╂枡绫诲埆涓嬫媺鏁扮粍
+      UomSelectArr: [], // 鍗曚綅涓嬫媺鏁扮粍
+      CheckItemSelectAllArr: [], // 妫�楠岄」鐩�(鎵�鏈�)
+      CheckItemSelectArr: [], // 妫�楠岄」鐩�
+      StepSelectArr: [], // 宸ュ簭鍚嶇О涓嬫媺鎵�鏈�
+
+      isCancel: true// 鏄惁鍙彇娑�
+
+    }
+  },
+
+  created() {
+    this.handleRequest()
+  },
+  mounted() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+  },
+  methods: {
+    tableColumnUpdate(val, isCopyTrue) {
+      if (isCopyTrue) {
+        this.tableColumnSettingsArray = val
+      }
+      this.tableTimeStampKey = new Date().getTime()
+      this.$refs.tableDataRef.doLayout()
+    },
+    handleRequest() {
+      this.getQualityInspectionSearch().then(res => {
+        if (res.code === '200') {
+          // this.getUomSelect()
+          this.getStepCheckItemSelect()
+          this.getPartSelect()
+          this.getStockTypeSelect()
+          this.getStepSelect()
+        }
+      })
+    },
+    async getStepSelect() {
+      const { data: res } = await StepData()
+      this.StepSelectArr = res
+    },
+    async getQualityInspectionSearch() {
+      const res = await QualityInspectionSearch(this.form)
+      this.tableData = res.data
+      this.total = res.count
+
+      return { code: res.code }
+    },
+
+    // 鎺掑簭鏀瑰彉鏃�
+    sortChange({ column, prop, order }) {
+      if (order === 'descending') {
+        order = 'desc'
+      } else if (order === 'ascending') {
+        order = 'asc'
+      } else {
+        order = 'desc'
+      }
+      this.form.order = order
+      this.form.prop = prop
+      this.getQualityInspectionSearch()
+    },
+    // 鏌ヨ
+    search() {
+      this.getQualityInspectionSearch()
+    },
+    // 閲嶇疆
+    reset() {
+      this.form.qualityinsptcode = ''
+      this.form.qualityinsptname = ''
+      this.form.status = ''
+      this.form.checktype = ''
+      this.form.sampltype = ''
+      this.form.suitobject = ''
+      this.getQualityInspectionSearch()
+    },
+
+    // 鏂板鎸夐挳
+    add(operation) {
+      this.operation = operation
+      this.dialogVisible = true
+    },
+    // 鏌ョ湅
+    async check(operation, row) {
+      this.operation = operation
+      this.dialogVisible = true
+
+      const { data: res } = await QualityInspectionSeeEdit({ qualityinsptcode: row.code })
+
+      this.$nextTick(() => {
+        this.dialogForm.qualityinsptcode = row.code
+        this.dialogForm.qualityinsptname = row.name
+        this.dialogForm.status = row.status
+        this.dialogForm.stepcode = row.stepcode
+        this.dialogForm.checktype = row.checktype
+        this.dialogForm.sampmethod = row.sampmethod
+        // this.dialogForm.sampscare =  row.sampscare
+        if (this.dialogForm.sampmethod === 'FIXED') {
+          this.dialogForm.sampnum = row.sampscare
+        } else {
+          this.dialogForm.sampscale = row.sampscare
+        }
+        this.dialogForm.suitobject = row.suitobject
+        this.dialogForm.suitpart = row.suitpart.split(',')
+        this.dialogForm.descr = row.descr
+        this.checkitem = res
+
+        this.$refs.tableDataRef2.doLayout()
+      })
+    },
+    // 淇敼鎸夐挳
+    async edit(operation, row) {
+      this.operation = operation
+      this.dialogVisible = true
+
+      const { data: res } = await QualityInspectionSeeEdit({ qualityinsptcode: row.code })
+
+      const tempCodeArr = []
+      res.forEach(i => {
+        let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
+        number = number === 0 ? (10 + Math.random()) : number
+        i.number = number
+        i.isVisible = 0
+        tempCodeArr.push(i.stepcheckitem_code)
+      })
+
+      this.CheckItemSelectArr = []
+      this.CheckItemSelectAllArr.forEach(i => {
+        if (!tempCodeArr.includes(i.code)) {
+          this.CheckItemSelectArr.push(i)
+        }
+      })
+
+      this.$nextTick(() => {
+        this.dialogForm.qualityinsptcode = row.code
+        this.dialogForm.qualityinsptname = row.name
+        this.dialogForm.status = row.status
+        this.dialogForm.stepcode = row.stepcode
+        this.dialogForm.checktype = row.checktype
+        this.dialogForm.sampmethod = row.sampmethod
+        if (this.dialogForm.sampmethod === 'FIXED') {
+          this.dialogForm.sampnum = row.sampscare
+        } else {
+          this.dialogForm.sampscale = row.sampscare
+        }
+        this.dialogForm.suitobject = row.suitobject
+        this.dialogForm.suitpart = row.suitpart.split(',')
+        this.dialogForm.descr = row.descr
+        this.checkitem = res
+        // console.log(this.checkitem, 2)
+        this.$refs.tableDataRef2.doLayout()
+      })
+    },
+    // 鍒犻櫎鎸夐挳
+    async del(row) {
+      this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        QualityInspectionDelete({ qualityinsptcode: row.code }).then(res => {
+          if (res.code === '200') {
+            this.$message.success('鍒犻櫎鎴愬姛!')
+            if (this.form.page > 1 && this.tableData.length === 1) {
+              this.form.page--
+            }
+            this.getQualityInspectionSearch()
+          }
+        })
+      }).catch(() => {
+        this.$message.info('宸插彇娑堝垹闄�')
+      })
+    },
+    // 鐗╂枡涓嬫媺
+    async getPartSelect() {
+      const { data: res } = await PartSelect()
+      this.PartSelectArr = res
+    },
+    // 鐗╂枡绫诲埆涓嬫媺
+    async getStockTypeSelect() {
+      const { data: res } = await TMaterielClassTree()
+      this.StockTypeSelectArr = res
+    },
+
+    // 閫傜敤瀵硅薄鍊兼敼鍙樻槸
+    suitobjectChange() {
+      this.dialogForm.suitpart = []
+    },
+    // 鑾峰彇妫�楠岄」鐩笅鎷夋帴鍙�
+    async getStepCheckItemSelect() {
+      const { data: res } = await QualityStepCheckItemSelect()
+
+      res.forEach(i => {
+        this.CheckItemSelectArr.push({
+          code: i.code,
+          name: i.name + ' / ' + i.code,
+          descr: i.descr
+        })
+      })
+      this.CheckItemSelectAllArr = JSON.parse(JSON.stringify(this.CheckItemSelectArr))
+    },
+    // 鏁板�煎垽瀹�
+    szpdChange(val, row) {
+      if (val === 'N') {
+        row.unit = ''
+        row.decimalnum = ''
+        row.standvalue = ''
+        row.uppervalue = ''
+        row.lowervalue = ''
+      }
+    },
+    // 琛ㄦ牸鍊兼敼鍙樻椂
+    tableChange(val, row) {
+      console.log(val, row)
+    },
+    // 璐ㄦ鍒楄〃  鏂板琛�
+    addZjlb() {
+      if (this.checkitem.find(i => i.isVisible === 1)) {
+        return this.$message.info('璇峰厛淇濆瓨褰撳墠琛屾暟鎹紒')
+      }
+
+      let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
+      number = number === 0 ? (10 + Math.random()) : number
+
+      this.checkitem.push({
+        number,
+        isVisible: 1,
+        // jyxmbm: '',
+        // jyxmmc: '',
+        stepcheckitem_code: '', // 妫�楠岄」鐩紪鐮�
+        required: 'Y', // 鏄惁蹇呭~
+        numberjudge: 'Y', // 鏄惁鏁板�煎垽鏂�
+        unit: '', // 鍗曚綅
+        decimalnum: '', // 灏忔暟浣嶆暟
+        standvalue: '', // 鏍囧噯鍊�
+        uppervalue: '', // 涓婇檺鍊�
+        lowervalue: '', // 涓嬮檺鍊�
+        stepcheckitem_desc: ''// 妫�楠岄」鐩弿杩�
+      })
+    },
+    // 鍒犻櫎璐ㄦ鍒楄〃琛�
+    delZjlbRow(row) {
+      const t = this.CheckItemSelectAllArr.find(i => i.code === row.stepcheckitem_code)
+      this.CheckItemSelectArr.unshift(t)
+      this.checkitem = this.checkitem.filter(i => i.number !== row.number)
+    },
+    // 淇濆瓨琛�
+    saveZjlbRow(row) {
+      if (!row.stepcheckitem_code) {
+        return this.$message.info('妫�楠岄」鐩笉鑳戒负绌猴紒')
+      }
+      if (row.numberjudge === 'Y' && !row.unit) {
+        return this.$message.info('鍗曚綅涓嶈兘涓虹┖锛�')
+      }
+      if (row.numberjudge === 'Y' && !row.decimalnum) {
+        return this.$message.info('灏忔暟浣嶆暟涓嶈兘涓虹┖锛�')
+      }
+      if (row.numberjudge === 'Y') {
+        if (!row.standvalue && !row.uppervalue && !row.lowervalue) {
+          return this.$message.info('鏍囧噯鍊笺�佷笂闄愬�笺�佷笅闄愬�煎叾涓竴椤逛笉鑳戒负绌猴紒')
+        }
+      }
+      this.CheckItemSelectArr = this.CheckItemSelectArr.filter(i => i.code !== row.stepcheckitem_code)
+      row.isVisible = 0
+
+      this.isCancel = true
+    },
+    // 鍙栨秷琛�
+    cancelZjlbRow(row) {
+      this.checkitem = this.checkitem.filter(i => i.number !== row.number)
+    },
+    // 缂栬緫琛�
+    editZjlbRow(row) {
+      if (this.checkitem.find(i => i.isVisible === 1)) {
+        return this.$message.info('璇峰厛淇濆瓨褰撳墠琛屾暟鎹紒')
+      }
+      row.isVisible = 1
+      this.isCancel = false
+      const t = this.CheckItemSelectAllArr.find(i => i.code === row.stepcheckitem_code)
+      this.CheckItemSelectArr.unshift(t)
+    },
+    // 瀵硅瘽妗嗗叧闂簨浠�
+    handleClose() {
+      this.dialogForm = {
+        qualityinsptcode: '',
+        qualityinsptname: '',
+        status: 'Y',
+        checktype: 'FirstCheck',
+        sampmethod: 'FIXED',
+        sampnum: '',
+        stepcode: '',
+        sampscale: '',
+        suitobject: 'P',
+        suitpart: [],
+        descr: ''
+      }
+
+      this.isCancel = true
+      this.checkitem = []
+      this.CheckItemSelectArr = JSON.parse(JSON.stringify(this.CheckItemSelectAllArr))
+      this.$refs.dialogForm.clearValidate()
+    },
+    // 瀵硅瘽妗嗗彇娑�
+    dialogVisibleCancel() {
+      this.dialogVisible = false
+    },
+    // 瀵硅瘽妗嗙‘璁�
+    dialogVisibleConfirm() {
+      this.$refs.dialogForm.validate(valid => {
+        if (valid) {
+          if (this.checkitem.length < 1) {
+            return this.$message.info('璐ㄦ鍒楄〃涓嶈兘涓虹┖锛�')
+          }
+
+          const checkitem = []
+          this.checkitem.forEach((item, index) => {
+            checkitem.push({
+              stepcheckitem_seq: index + 1,
+              stepcheckitem_code: item.stepcheckitem_code,
+              stepcheckitem_desc: item.stepcheckitem_desc,
+              required: item.required,
+              numberjudge: item.numberjudge,
+              unit: item.unit,
+              decimalnum: item.decimalnum,
+              standvalue: item.standvalue,
+              uppervalue: item.uppervalue,
+              lowervalue: item.lowervalue
+            })
+          })
+          const data = {
+            qualityinsptcode: this.dialogForm.qualityinsptcode,
+            qualityinsptname: this.dialogForm.qualityinsptname,
+            status: this.dialogForm.status,
+            stepcode: this.dialogForm.checktype === 'InCheck' || this.dialogForm.checktype === 'OutCheck' ? '' : this.dialogForm.stepcode,
+            checktype: this.dialogForm.checktype,
+            sampmethod: this.dialogForm.sampmethod,
+            sampscare: this.dialogForm.sampnum ? this.dialogForm.sampnum : this.dialogForm.sampscale,
+            suitobject: this.dialogForm.suitobject,
+            suitpart: this.dialogForm.suitpart.join(','),
+            type: this.operation === 'add' ? 'Add' : 'Update',
+            descr: this.dialogForm.descr,
+            checkitem
+          }
+
+          this.$store.state.app.buttonIsDisabled = true
+          QualityInspectionAddEditSave(data).then(res => {
+            if (res.code === '200') {
+              this.$message.success(this.operation === 'add' ? '淇濆瓨鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+              this.dialogVisible = false
+              this.getQualityInspectionSearch()
+              this.$store.state.app.buttonIsDisabled = false
+            } else {
+              this.$message.error(this.operation === 'add' ? '淇濆瓨澶辫触锛�' : '淇敼澶辫触锛�')
+            }
+          })
+        }
+      })
+    },
+    // 鑾峰彇椤甸潰楂樺害
+    getHeight() {
+      this.$nextTick(() => {
+        this.mainHeight = window.innerHeight - 85
+        this.tableHeight = this.mainHeight - 255
+        this.$refs.tableDataRef.doLayout()
+      })
+    },
+    tableRowClassName({ row, rowIndex }) {
+      return 'custom-row'
+    }
+  }
 }
 </script>
 
-<style scoped>
-
+<style scoped lang="scss">
+::v-deep .el-select__caret {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
 </style>

--
Gitblit v1.9.3