1.质检方案对接接口中

loulijun2021

2023-02-28 c2f67da5b5086f6e3e4bc01f61e81e0505a17d10

1.质检方案对接接口中

 src/api/zlgl.js

@@ -123,6 +123,7 @@
    params: data
  })
}

// 生产开报工,工序检验提交保存
export function SaveMesOrderStepCheckItem(data) {
  return request({
@@ -140,6 +141,7 @@
    params: data
  })
}

// 工序检验记录列表查询
export function StepCheckTableSubSearch(data) {
  return request({
@@ -148,6 +150,7 @@
    params: data
  })
}

// 工序检验记录导出
export function StepCheckTableOutExcel(data) {
  return request({
@@ -157,3 +160,39 @@
  })
}

// 质检方案列表查询
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
  })
}


 src/views/scgl/sckbg.vue

@@ -532,19 +532,19 @@
        :model="dialogForm"
        label-width="110px"
      >
        <el-form-item label="工单编号：">
        <el-form-item label="工单编号：" style="margin: 0 10px 0 0">
          <div style="width: 200px">{{ dialogForm.wo_code }}</div>
        </el-form-item>
        <el-form-item label="产品编码：">
        <el-form-item label="产品编码：" style="margin: 0 10px 0 0">
          <div style="width: 200px">{{ dialogForm.partcode }}</div>
        </el-form-item>
        <el-form-item label="产品名称：">
        <el-form-item label="产品名称：" style="margin: 0 10px 0 0">
          <div style="width: 200px">{{ dialogForm.partname }}</div>
        </el-form-item>
        <el-form-item label="产品规格：">
        <el-form-item label="产品规格：" style="margin: 0 10px 0 0">
          <div style="width: 200px">{{ dialogForm.partspec }}</div>
        </el-form-item>
        <el-form-item label="当前工序：">
        <el-form-item label="当前工序：" style="margin: 0 10px 0 0">
          <div style="width: 200px">{{ dialogForm.stepname }}</div>
        </el-form-item>
        <el-form-item v-if="false" label="工序描述：">
@@ -554,20 +554,20 @@
          </div>
          <!--          </el-tooltip>-->
        </el-form-item>
        <el-form-item label="任务数量：">
        <el-form-item label="任务数量：" style="margin: 0 10px 0 0">
          <div style="width: 200px">{{ dialogForm.planqty }}</div>
        </el-form-item>

        <el-form-item v-if="dialogTitle==='自制开始'" label="未开/已开：">
        <el-form-item v-if="dialogTitle==='自制开始'" label="未开/已开：" style="margin: 0 10px 0 0">
          <div style="width: 200px">{{ dialogForm.noreportqty }}/{{ dialogForm.reportqty }}</div>
        </el-form-item>
        <el-form-item v-if="dialogTitle==='自制报工'" label="未报/已报：">
        <el-form-item v-if="dialogTitle==='自制报工'" label="未报/已报：" style="margin: 0 10px 0 0">
          <div style="width: 200px">{{ dialogForm.noreportqty }}/{{ dialogForm.reportqty }}</div>
        </el-form-item>
        <el-form-item v-if="dialogTitle==='外协发料'" label="未发/已发：">
        <el-form-item v-if="dialogTitle==='外协发料'" label="未发/已发：" style="margin: 0 10px 0 0">
          <div style="width: 200px">{{ dialogForm.noreportqty }}/{{ dialogForm.reportqty }}</div>
        </el-form-item>
        <el-form-item v-if="dialogTitle==='外协收料'" label="未收/已收：">
        <el-form-item v-if="dialogTitle==='外协收料'" label="未收/已收：" style="margin: 0 10px 0 0">
          <div style="width: 200px">{{ dialogForm.noreportqty }}/{{ dialogForm.reportqty }}</div>
        </el-form-item>
        <!--自制开始-->
@@ -590,7 +590,7 @@
          </el-select>
        </el-form-item>
        <!--     自制报工   -->
        <el-form-item v-if="dialogTitle==='自制报工'" label="下道工序：">
        <el-form-item v-if="dialogTitle==='自制报工'" label="下道工序：" style="margin: 0 10px 0 0">
          <div style="width: 200px">{{ dialogForm.nextstepname }}</div>
        </el-form-item>

@@ -694,8 +694,11 @@
          <el-input v-model="dialogForm.remarks" type="textarea" style="width: 200px;" />
        </el-form-item>
        <div v-if="dialogTitle==='自制报工'&&dialogForm.reckway==='group'">
          <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 人员列表
          <el-button v-waves type="primary" style="margin: 10px 0" @click="userAdd">增行</el-button>
          <div style="display: flex;align-items:center;height: 40px;margin-bottom: 10px">
            <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" />
            <div style="margin: 0 15px 0 5px;">人员列表</div>
            <el-button v-waves type="primary" style="margin: 10px 0" @click="userAdd">增行</el-button>
          </div>
          <el-table
            ref="userTableDataRef"
            :data="userTableData"
@@ -704,7 +707,7 @@
            :row-class-name="tableRowClassName"
            :header-cell-style="this.$headerCellStyle"
            :cell-style="this.$cellStyle"
            height="180"
            height="188"
            highlight-current-row
            style="width: 100%"
          >
@@ -761,7 +764,13 @@
            >
              <template slot-scope="{row}">
                <div class="operationClass">
                  <el-button v-if="(row.isVisible===1&&!userIsSave)||row.isVisible===2" v-waves type="text" @click="userSave(row)">保存</el-button>
                  <el-button
                    v-if="(row.isVisible===1&&!userIsSave)||row.isVisible===2"
                    v-waves
                    type="text"
                    @click="userSave(row)"
                  >保存
                  </el-button>
                  <el-button v-if="row.isVisible===1" v-waves type="text" @click="userCancel(row)">取消</el-button>
                  <el-button v-if="row.isVisible===0" v-waves type="text" @click="userDel(row)">删除</el-button>
                  <el-button v-if="row.isVisible===0" v-waves type="text" @click="editRatio(row)">修改比例</el-button>
@@ -1496,7 +1505,7 @@
    this.getHeight()

    this.$nextTick(() => {
      $("input[name='produceCode']")[0].focus()
      $('input[name=\'produceCode\']')[0].focus()
      // this.bindQRCode('10001;001')
    })
    // webapp_urlprotocol_startup()
@@ -1583,21 +1592,21 @@
      if (this.$refs.elTabs.currentName === '0') {
        this.$nextTick(() => {
          this.getMesOrderStepSearch()
          $("input[name='produceCode']")[0].focus()
          $('input[name=\'produceCode\']')[0].focus()
          this.WXform.orderstepqrcode = ''
        })
      }
      if (this.$refs.elTabs.currentName === '1') {
        this.$nextTick(() => {
          this.getMesOrderWxStepSearch()
          $("input[name='WXproduceCode']")[0].focus()
          $('input[name=\'WXproduceCode\']')[0].focus()
          this.form.orderstepqrcode = ''
        })
      }
      if (this.$refs.elTabs.currentName === '2') {
        this.$nextTick(() => {
          this.getBadList()
          $("input[name='badProduceCode']")[0].focus()
          $('input[name=\'badProduceCode\']')[0].focus()
          this.badForm.orderstepqrcode = ''
        })
      }
@@ -1805,6 +1814,8 @@
        this.dialogForm.nextstepcode = obj.nextstepcode

        this.dialogForm.startqtySum = obj.noreportqty

        this.$refs.userTableDataRef.doLayout()
      })

      await this.getMesOrderStepStartSelectEqp()
@@ -1937,10 +1948,14 @@
      this.ZZuserArr = [...this.ZZuserArr].filter(x => [...this.userTableData].every(y => y.usercode !== x.usercode))

      this.calculatedValue()
      this.$refs.tableDataRef.doLayout()
      this.$nextTick(() => {
        this.$refs.tableDataRef.doLayout()
        this.$refs.userTableDataRef.doLayout()
      })
    },
    calculatedValue() {
      const total = 100; let value = 0
      const total = 100
      let value = 0
      this.userTableData.forEach(item => {
        item.ratio = parseFloat((100 / this.userTableData.length).toFixed(2))
        value += item.ratio
@@ -1949,7 +1964,7 @@
      if (value !== total) {
        // let temp = this.userTableData
        // temp[temp.length-1].ratio=temp[temp.length-1].ratio+(total-value)
        this.userTableData[ this.userTableData.length - 1].ratio = parseFloat((this.userTableData[ this.userTableData.length - 1].ratio + (total - value)).toFixed(2))
        this.userTableData[this.userTableData.length - 1].ratio = parseFloat((this.userTableData[this.userTableData.length - 1].ratio + (total - value)).toFixed(2))
      }
    },
    // 修改分配比列
@@ -2235,7 +2250,10 @@
              eqpcode: this.dialogForm.eqpcode, // 设备编码
              usergroupcode: this.dialogForm.usergroupcode, // 班组编码
              // reportuser: reportuser, // 报工人员
              reportuser: this.dialogForm.reckway === 'group' ? this.userTableData : [{ usercode: this.dialogForm.operation, ratio: 100 }],
              reportuser: this.dialogForm.reckway === 'group' ? this.userTableData : [{
                usercode: this.dialogForm.operation,
                ratio: 100
              }],
              taskqty: this.dialogForm.planqty, // 任务数量
              // startqty: this.dialogForm.startqty, // 开工数量
              startqty: this.dialogForm.reportqty, // 开工数量

 src/views/zlgl/gxjybz.vue

@@ -194,7 +194,7 @@
          <el-table-column
            show-tooltip-when-overflow
            prop="code"
            label="检验标准编码"
            label="检验项目编码"
          >
            <template slot-scope="{row}">
              <div v-if="row.isVisible===0">{{ row.code }}</div>
@@ -217,7 +217,7 @@
          <el-table-column
            prop="name"
            show-tooltip-when-overflow
            label="检验标准名称"
            label="检验项目名称"
          >
            <template slot-scope="{row}">
              <div v-if="row.isVisible===0">{{ row.name }}</div>

 src/views/zlgl/zjfa.vue

@@ -3,7 +3,6 @@
    <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>
        <!--        <el-button v-waves icon="el-icon-download" @click="upload">导入</el-button>-->
      </div>

      <div class="bodyTopFormGroup">
@@ -16,15 +15,15 @@
        >
          <div class="elForm">
            <el-form-item label="质检方案编码" style=" display: flex;">
              <el-input v-model="form.OrgCode" placeholder="请输入" style="width: 200px" />
              <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.OrgName" placeholder="请输入" style="width: 200px" />
              <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.OrgType" style="width: 200px" placeholder="请选择">
              <el-select v-model="form.status" style="width: 200px" placeholder="请选择">
                <el-option
                  v-for="item in OrgTypeArr"
                  v-for="item in whetherOrNot"
                  :key="item.code"
                  :label="item.name"
                  :value="item.code"
@@ -32,9 +31,9 @@
              </el-select>
            </el-form-item>
            <el-form-item label="质检类型" style=" display: flex;">
              <el-select v-model="form.OrgType" style="width: 200px" placeholder="请选择">
              <el-select v-model="form.checktype" style="width: 200px" placeholder="请选择">
                <el-option
                  v-for="item in OrgTypeArr"
                  v-for="item in checktypeArr"
                  :key="item.code"
                  :label="item.name"
                  :value="item.code"
@@ -42,9 +41,9 @@
              </el-select>
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="抽样方式" style=" display: flex;">
              <el-select v-model="form.OrgType" style="width: 200px" placeholder="请选择">
              <el-select v-model="form.sampltype" style="width: 200px" placeholder="请选择">
                <el-option
                  v-for="item in OrgTypeArr"
                  v-for="item in sampltypeArr"
                  :key="item.code"
                  :label="item.name"
                  :value="item.code"
@@ -52,9 +51,9 @@
              </el-select>
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="适用对象" style=" display: flex;">
              <el-select v-model="form.OrgType" style="width: 200px" placeholder="请选择">
              <el-select v-model="form.suitobject" style="width: 200px" placeholder="请选择">
                <el-option
                  v-for="item in OrgTypeArr"
                  v-for="item in suitobjectArr"
                  :key="item.code"
                  :label="item.name"
                  :value="item.code"
@@ -110,37 +109,59 @@
            label="序号"
          />
          <el-table-column
            prop="org_code"
            prop="code"
            label="质检方案编码"
            sortable="custom"
          />
          <el-table-column
            prop="org_name"
            prop="name"
            label="质检方案名称"
            sortable="custom"
          />
          <el-table-column
            prop="description"
            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="parentorg_name"
            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="lm_user"
            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="lm_user"
            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="lm_user"
            prop="username"
            label="创建人员"
            sortable="custom"
          />
@@ -157,6 +178,14 @@
          >
            <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" @click="edit('edit',row)" />
                </el-tooltip>
@@ -176,15 +205,15 @@
        align="right"
        layout="total,prev, pager, next,sizes"
        popper-class="select_bottom"
        @pagination="getOrganizationSearch"
        @pagination="getQualityInspectionSearch"
      />
    </div>

    <el-dialog
      v-el-drag-dialog
      :title="operation==='add'?'新增':'编辑'"
      :title="operation==='add'?'新增':operation==='check'?'查看':'编辑'"
      :visible.sync="dialogVisible"
      width="1200px"
      width="1260px"
      :close-on-click-modal="false"
      top="5vh"
      @closed="handleClose"
@@ -195,22 +224,22 @@
      <!--        <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="zjfabm">
          <el-input v-model="dialogForm.zjfabm" :disabled="operation!=='add'" style="width: 200px" />
        <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="zjfamc">
          <el-input v-model="dialogForm.zjfamc" style="width: 200px" />
        <el-form-item label="质检方案名称" prop="stepcheckitem_name">
          <el-input v-model="dialogForm.stepcheckitem_name" style="width: 200px" />
        </el-form-item>
        <br>
        <el-form-item prop="yxzt" label="有效状态">
        <el-form-item prop="status" label="有效状态">
          <el-select
            v-model="dialogForm.yxzt"
            v-model="dialogForm.status"
            style="width: 200px"
            placeholder="请选择"
            :popper-append-to-body="false"
          >
            <el-option
              v-for="item in yxztArr"
              v-for="item in whetherOrNot"
              :key="item.code"
              :label="item.name"
              :value="item.code"
@@ -218,42 +247,42 @@
          </el-select>
        </el-form-item>
        <br>
        <el-form-item prop="zjlx" label="质检类型">
          <el-radio-group v-model="dialogForm.zjlx">
            <el-radio label="rcjy">入厂检验</el-radio>
            <el-radio label="ccjy">出厂检验</el-radio>
            <el-radio label="cjjy">首检检验</el-radio>
            <el-radio label="xj">巡检</el-radio>
            <el-radio label="wgj">完工检</el-radio>
        <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="cyfs" label="抽样方式">
          <el-radio-group v-model="dialogForm.cyfs" style="width: 200px;">
            <el-radio label="gscj">固时抽检</el-radio>
            <el-radio label="blcj">比例抽检</el-radio>
        <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.cyfs==='gscj'" label="样本数量" prop="ybsl">
          <el-input v-model="dialogForm.ybsl" style="width: 200px" />
        <el-form-item v-if="dialogForm.sampmethod==='FIXED'" label="样本数量" prop="sampnum">
          <el-input v-model="dialogForm.sampnum" style="width: 200px" />
        </el-form-item>
        <el-form-item v-if="dialogForm.cyfs==='blcj'" label="抽检比例" prop="cjbl">
          <el-input v-model="dialogForm.cjbl" style="width: 180px" />
        <el-form-item v-if="dialogForm.sampmethod==='SCARE'" label="抽检比例" prop="sampscale">
          <el-input v-model="dialogForm.sampscale" style="width: 180px" />
          %
        </el-form-item>
        <br>
        <el-form-item prop="sydx" label="适用对象">
          <el-radio-group v-model="dialogForm.sydx" style="width: 200px;">
            <el-radio label="wllb">物料类别</el-radio>
            <el-radio label="wl">物料</el-radio>
        <el-form-item prop="suitobject" label="适用对象">
          <el-radio-group v-model="dialogForm.suitobject" style="width: 200px;">
            <el-radio label="PY">物料类别</el-radio>
            <el-radio label="P">物料</el-radio>
          </el-radio-group>
        </el-form-item>
        <el-form-item prop="sywl" :label="dialogForm.sydx==='wl'?'适用物料':'适用物料类别'">
          <el-input v-model="dialogForm.sywl" style="width: 200px;" />
        <el-form-item prop="suitpart" :label="dialogForm.suitobject==='P'?'适用物料':'适用物料类别'">
          <el-input v-model="dialogForm.suitpart" style="width: 200px;" />
        </el-form-item>
        <br>
        <el-form-item label="检验方案描述">
          <el-input v-model="dialogForm.jyfams" type="textarea" :autosize="{ minRows: 2 }" />
          <el-input v-model="dialogForm.descr" type="textarea" :autosize="{ minRows: 2 }" />
        </el-form-item>
      </el-form>

@@ -271,7 +300,7 @@
          type="primary"
          style="margin-left: 20px;"
          icon="el-icon-circle-plus-outline"
          @click="zjlbAdd"
          @click="addZjlb"
        >新增
        </el-button>
      </div>
@@ -279,7 +308,7 @@
      <el-table
        ref="tableDataRef"
        class="tableFixed"
        :data="zjlbTable"
        :data="checkitem"
        height="250"
        style="height:250px"
        border
@@ -289,203 +318,251 @@
        :cell-style="this.$cellStyle"
      >
        <el-table-column
          prop="RowNum"
          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="jyxmbm"
          width="105"
          label="检验项目编码"
          prop="stepcheckitem_code"
          width="250"
          label="检验项目 / 编码"
        >
          <template slot-scope="{row}">
            <el-select
              v-if="row.isVisible===1"
              v-model="row.jyxmbm"
              v-model="row.stepcheckitem_code"
              filterable
              placeholder="请选择"
              @change="val=>tableChange(val,row)"
              style="width: 100%;"
            >
              <!--              @change="val=>tableChange(val,row)"-->
              <el-option
                v-for="item in PartSelectArr"
                :key="item.partname"
                :label="item.partcode"
                :value="item.partname"
                v-for="item in CheckItemSelectArr"
                :key="item.code"
                :label="item.name"
                :value="item.code"
              />
            </el-select>
            <div v-if="row.isVisible===0">{{ row.jyxmbm }}</div>
            <div v-if="row.isVisible===0">{{ CheckItemSelectAllArr.find(i => i.code === row.stepcheckitem_code).name }}</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="sfbt"
          prop="required"
          width="85"
          label="是否必填"
        >
          <template slot-scope="{row}">
            <el-select
              v-if="row.isVisible===1"
              v-model="row.sfbt"
              v-model="row.required"
              filterable
              placeholder="请选择"
            >
              <el-option
                v-for="item in PartSelectArr"
                :key="item.partname"
                :label="item.partcode"
                :value="item.partname"
                v-for="item in whetherOrNot"
                :key="item.code"
                :label="item.name"
                :value="item.code"
              />
            </el-select>
            <div v-if="row.isVisible===0">{{ row.sfbt }}</div>
            <div v-if="row.isVisible===0">{{ row.required === 'Y' ? '是' : '否' }}</div>
          </template>
        </el-table-column>
        <el-table-column
          prop="szpd"
          prop="numberjudge"
          width="85"
          label="数值判定"
        >
          <template slot-scope="{row}">
            <el-select
              v-if="row.isVisible===1"
              v-model="row.szpd"
              v-model="row.numberjudge"
              filterable
              placeholder="请选择"
              @change="val=>szpdChange(val,row)"
            >
              <el-option
                v-for="item in PartSelectArr"
                :key="item.partname"
                :label="item.partcode"
                :value="item.partname"
                v-for="item in whetherOrNot"
                :key="item.code"
                :label="item.name"
                :value="item.code"
              />
            </el-select>
            <div v-if="row.isVisible===0">{{ row.szpd }}</div>
            <div v-if="row.isVisible===0">{{ row.numberjudge === 'Y' ? '是' : '否' }}</div>
          </template>
        </el-table-column>
        <el-table-column
          prop="dw"
          prop="unit"
          label="单位"
        >
          <template slot-scope="{row}">
            <el-input
              v-if="row.isVisible===1"
              v-model="row.dw"
              oninput="value=value.replace(/[^0-9.]/g,'')"
              placeholder="请输入"
            />
            <div v-if="row.isVisible===0">{{ row.dw }}</div>
          </template>
        </el-table-column>
        <el-table-column
          prop="xsws"
          label="小数位数"
        >
          <template slot-scope="{row}">
            <el-select
              v-if="row.isVisible===1"
              v-model="row.xsws"
              v-model="row.unit"
              filterable
              :disabled="row.numberjudge==='N'"
              placeholder="请选择"
            >
              <el-option
                v-for="item in PartSelectArr"
                :key="item.partname"
                :label="item.partcode"
                :value="item.partname"
                v-for="item in UomSelectArr"
                :key="item.code"
                :label="item.name"
                :value="item.code"
              />
            </el-select>
            <div v-if="row.isVisible===0">{{ row.dw }}</div>
            <div v-if="row.isVisible===0">{{
              row.numberjudge === 'Y' ? UomSelectArr.find(i => i.code === row.unit).name : '/'
            }}
            </div>
          </template>
        </el-table-column>
        <el-table-column
          prop="bzz"
          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-if="row.isVisible===0">{{ 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.bzz"
              v-model="row.standvalue"
              :disabled="row.numberjudge==='N'"
              oninput="value=value.replace(/[^0-9.]/g,'')"
              placeholder="请输入"
            />
            <div v-if="row.isVisible===0">{{ row.bzz }}</div>
            <div v-if="row.isVisible===0">{{ row.standvalue ? row.standvalue : '/' }}</div>
          </template>
        </el-table-column>
        <el-table-column
          prop="sxz"
          prop="uppervalue"
          label="上限值"
        >
          <template slot-scope="{row}">
            <el-input
              v-if="row.isVisible===1"
              v-model="row.sxz"
              v-model="row.uppervalue"
              :disabled="row.numberjudge==='N'"
              oninput="value=value.replace(/[^0-9.]/g,'')"
              placeholder="请输入"
            />
            <div v-if="row.isVisible===0">{{ row.sxz }}</div>
            <div v-if="row.isVisible===0">{{ row.uppervalue ? row.uppervalue : '/' }}</div>
          </template>
        </el-table-column>
        <el-table-column
          prop="xxz"
          prop="lowervalue"
          label="下限值"
        >
          <template slot-scope="{row}">
            <el-input
              v-if="row.isVisible===1"
              v-model="row.xxz"
              v-model="row.lowervalue"
              :disabled="row.numberjudge==='N'"
              oninput="value=value.replace(/[^0-9.]/g,'')"
              placeholder="请输入"
            />
            <div v-if="row.isVisible===0">{{ row.xxz }}</div>
            <div v-if="row.isVisible===0">{{ row.lowervalue ? row.lowervalue : '/' }}</div>
          </template>
        </el-table-column>
        <el-table-column
          prop="ms"
          prop="stepcheckitem_desc"
          label="描述"
        >
          <template slot-scope="{row}">
            <el-input
              v-if="row.isVisible===1"
              v-model="row.ms"
              oninput="value=value.replace(/[^0-9.]/g,'')"
              v-model="row.stepcheckitem_desc"
              placeholder="请输入"
            />
            <div v-if="row.isVisible===0">{{ row.ms }}</div>
            <div v-if="row.isVisible===0">{{ row.stepcheckitem_desc ? row.stepcheckitem_desc : '/' }}</div>
          </template>
        </el-table-column>
        <el-table-column
          label="操作"
          width="80"
          width="120"
          fixed="right"
        >
          <template slot-scope="{row}">
            <div class="operationClass">
              <el-tooltip class="item" effect="dark" content="编辑" placement="top">
                <i class="el-icon-edit-outline" />
              </el-tooltip>
              <el-tooltip v-del-tab-index class="item" effect="dark" content="删除" placement="top">
                <i class="el-icon-delete" />
              </el-tooltip>
              <el-button v-if="row.isVisible===0" v-waves type="text" @click="editZjlbRow(row)">编辑</el-button>
              <el-button v-if="row.isVisible===0" v-waves type="text" @click="delZjlbRow(row)">删除</el-button>
              <el-button v-if="row.isVisible===1" v-waves type="text" @click="saveZjlbRow(row)">保存</el-button>
              <el-button v-if="row.isVisible===1" v-waves type="text" @click="cancelZjlbRow(row)">取消</el-button>
            </div>
          </template>
        </el-table-column>
@@ -499,16 +576,6 @@
      </span>
    </el-dialog>

    <!--导入组件-->
    <import-picker
      ref="importPickerFunc"
      class="importPickerClass"
      :shows.sync="shows"
      :title="title_value"
      :colos="colos"
      :code="code"
    />

  </div>
</template>

@@ -516,15 +583,17 @@
import Pagination from '@/components/Pagination'
import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import ImportPicker from '@/components/ImportPicker'

import { validateCode } from '@/utils/global'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import { UomSelect } from '@/api/zzmx'
import { QualityInspectionDelete, QualityInspectionSearch, StepCheckItemSelect } from '@/api/zlgl'

export default {
  name: 'Zzjg',
  components: {
    Pagination, ImportPicker
    Pagination
  },
  directives: { elDragDialog, waves },
  data() {
@@ -534,96 +603,113 @@
      mainHeight: 0,
      tableHeight: 0,
      form: {
        OrgCode: '', // 组织架构代码
        OrgName: '', // 组织架构名称
        OrgType: '', // 组织类型
        UserName: '', // 创建人员
        createdate: '',
        prop: 'lm_date', // 排序字段
        qualityinsptcode: '', // 质检方案编码
        qualityinsptname: '', // 质检方案名称
        status: '', // 有效状态
        checktype: '', // 质检类型
        sampltype: '', // 抽样方式
        suitobject: '', // 适用对象
        prop: 'code', // 排序字段
        order: 'desc', // 排序字段
        page: 1, // 第几页
        rows: 20 // 每页多少条
      },
      OrgTypeArr: [
        { label: '是', value: 'Y' },
        { label: '否', value: 'N' }
      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: [],
      dialogVisible: true,
      dialogVisible: false,
      dialogForm: {
        yxzt: '',
        zjfabm: '',
        zjfamc: '',
        zjlx: '',
        cyfs: 'gscj',
        ybsl: '',
        cjbl: '',
        sydx: 'wl',
        sywl: '',
        jyfams: ''
        qualityinsptcode: '', // 质检方案编码
        stepcheckitem_name: '', // 质检方案名称
        status: 'Y', // 有效状态
        checktype: '', // 检验类型
        sampmethod: 'FIXED', // 抽检方式
        sampnum: '', // 样本数量
        sampscale: '', // 抽检比例
        suitobject: 'P', // 适用对象
        suitpart: '', // 适用物料
        descr: '' // /描述
      },
      operation: '',
      dialogFormRules: {
        yxzt: [
        status: [
          { required: true, message: '请输入选择类型', trigger: ['blur', 'change'] }
        ],
        zjfabm: [
        qualityinsptcode: [
          { required: true, validator: validateCode, trigger: ['blur', 'change'] }
        ],
        zjfamc: [
        stepcheckitem_name: [
          { required: true, message: '请输入质检方案名称', trigger: ['blur', 'change'] }
        ],
        zjlx: [
        checktype: [
          { required: true, message: '请选择质检方式', trigger: ['blur', 'change'] }
        ],
        cyfs: [
        sampmethod: [
          { required: true, message: '请选择抽样方式', trigger: ['blur', 'change'] }
        ],
        ybsl: [
        sampnum: [
          { required: true, message: '请输入样本数量', trigger: ['blur', 'change'] }
        ],
        cjbl: [
        sampscale: [
          { required: true, message: '请输入抽检比例', trigger: ['blur', 'change'] }
        ],
        sydx: [
        suitobject: [
          { required: true, message: '请选择适用对象', trigger: ['blur', 'change'] }
        ],
        sywl: [
        suitpart: [
          { required: true, message: '请输入适用物料', trigger: ['blur', 'change'] }
        ]
      },
      yxztArr: [
      checkitem: [],

      whetherOrNot: [ // 是或否
        { code: 'Y', name: '是' },
        { code: 'N', name: '否' }
      ],
      zjlbTable: [],
      title_value: '数据导入 / 点检部位',
      code: '4',
      shows: false

      UomSelectArr: [], // 单位下拉数组
      CheckItemSelectAllArr: [], // 检验项目(所有)
      CheckItemSelectArr: []// 检验项目

    }
  },
  watch: {
    shows() {
      if (!this.shows) {
        this.getOrganizationSearch()
      }
    }
  },

  created() {
    this.getOrganizationSearch()
    this.handleRequest()
  },
  mounted() {
    window.addEventListener('resize', this.getHeight)
    this.getHeight()
  },
  methods: {
    async getOrganizationSearch() {
      const res = await OrganizationSearch(this.form)
    handleRequest() {
      this.getQualityInspectionSearch().then(res => {
        if (res.code === '200') {
          this.getUomSelect()
          this.getStepCheckItemSelect()
        }
      })
    },
    async getQualityInspectionSearch() {
      const res = await QualityInspectionSearch(this.form)
      this.tableData = res.data
      this.total = res.count

      return { code: res.code }
    },
    // 排序改变时
    sortChange({ column, prop, order }) {
@@ -636,31 +722,30 @@
      }
      this.form.order = order
      this.form.prop = prop
      this.getOrganizationSearch()
      this.getQualityInspectionSearch()
    },
    // 查询
    search() {
      this.getOrganizationSearch()
    },
    // 导入按钮
    upload() {
      this.shows = true
      this.$refs.importPickerFunc.newDataFunc()
    },
    colos() {
      this.shows = false
      this.getQualityInspectionSearch()
    },
    // 重置
    reset() {
      this.form.OrgCode = ''
      this.form.OrgName = ''
      this.form.OrgType = ''
      this.form.UserName = ''
      this.getOrganizationSearch()
      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
    },
    // 查看
    check(operation, row) {
      this.operation = operation
      this.dialogVisible = true
    },
@@ -670,9 +755,9 @@
      this.dialogVisible = true

      this.$nextTick(() => {
        this.dialogForm.OrgCode = row.org_code
        this.dialogForm.OrgName = row.org_name
        this.dialogForm.SupUnit = row.parent_id
        this.dialogForm.qualityinsptcode = row.code
        this.dialogForm.qualityinsptname = row.name
        // this.dialogForm.SupUnit = row.parent_id
      })
    },
    // 删除按钮
@@ -682,50 +767,130 @@
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        DeleteOrganization({ orgid: row.code }).then(res => {
        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.getOrganizationSearch()
            this.getQualityInspectionSearch()
          }
        })
      }).catch(() => {
        this.$message.info('已取消删除')
      })
    },
    // 获取单位下拉接口
    async getUomSelect() {
      const { data: res } = await UomSelect()
      this.UomSelectArr = res
    },
    // 获取检验项目下拉接口
    async getStepCheckItemSelect() {
      const { data: res } = await StepCheckItemSelect()

      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)
    },
    // 质检列表  //下周一再写
    zjlbAdd() {
    // 质检列表  新增行
    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.zjlbTable.unshift({
      this.checkitem.unshift({
        number,
        isVisible: 1,
        jyxmbm: '',
        jyxmmc: '',
        sfbt: '',
        szpd: '',
        dw: '',
        xsws: '',
        bzz: '',
        sxz: '',
        xxz: '',
        ms: ''
        // 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
    },
    // 取消行
    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('请先保存当前行数据！')
      }
      const t = this.CheckItemSelectAllArr.find(i => i.code === row.stepcheckitem_code)
      this.CheckItemSelectArr.unshift(t)
      row.isVisible = 1
    },
    // 对话框关闭事件
    handleClose() {
      this.dialogForm.OrgType = ''
      this.dialogForm.OrgCode = ''
      this.dialogForm.OrgName = ''
      this.dialogForm.SupUnit = ''
      this.dialogForm = {
        qualityinsptcode: '',
        stepcheckitem_name: '',
        status: 'Y',
        checktype: '',
        sampmethod: 'FIXED',
        sampnum: '',
        sampscale: '',
        suitobject: 'P',
        suitpart: '',
        descr: ''
      }

      this.checkitem = []
      this.$refs.dialogForm.clearValidate()
    },

@@ -737,21 +902,23 @@
    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.getOrganizationSearch()
            } else {
              this.$message.error(this.operation === 'add' ? '添加失败！' : '修改失败！')
            }
          })
          console.log(this.dialogForm, 'dialogForm')
          console.log(this.checkitem, 'checkitem')
          // const data = {
          //   OrganCode: this.dialogForm.qualityinsptcode,
          //   OrganName: this.dialogForm.qualityinsptname,
          //   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.getQualityInspectionSearch()
          //   } else {
          //     this.$message.error(this.operation === 'add' ? '添加失败！' : '修改失败！')
          //   }
          // })
        }
      })
    },