1.修改打印bug

loulijun2021

2022-07-20 323d9cdb46f8e0bf1691af18c972277ecf34a86e

 src/views/zlgl/gxjy.vue

@@ -1,326 +1,450 @@
<template>
  <div>
    <div class="body" :style="{height:mainHeight+'px'}">
      <div style="padding: 10px 5px 0 0">
        <el-form
          ref="form"
          :model="form"
          label-width="80px"
          inline
          style="display: flex;justify-content: space-between"
        >
          <div class="elForm">
            <el-form-item label="项目编码" style=" display: flex;">
              <el-input v-model="form.defectcode" 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>
      <div style="margin-left: 10px;margin-top:10px;display: flex;flex-direction: column">
        <div style="margin-bottom: 15px;font-size: 14px">
          <i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />扫码信息
        </div>
        <div style="display: flex;align-items: center">
          <div style="width: 90px">扫描条码：</div>
          <el-input
            v-model="form.orderstepqrcode"
            name="GXproduceCode"
            style="width: 300px"
            @keyup.enter.native="val=>enterNative(val,'GXproduceCode')"
          />
        </div>
        <!--        六项信息      -->
        <div style="display:flex;margin-top: 10px;align-items: center; line-height: 50px">
          <div style="display: flex;">
            <div style="display: flex;margin-right: 50px">
              <div style="width: 90px">工单编码：</div>
              <div style="width: 200px">{{ form.wo_code }}</div>
            </div>
            <div style="display: flex;">
              <div style="width: 90px">产品编码：</div>
              <div style="width: 100px">{{ form.partcode }}</div>
            </div>
          </div>
          <div style="display: flex;margin-left: 30px;">
            <div style="display: flex;margin-right: 50px">
              <div style="width: 90px">产品名称：</div>
              <div style="width: 100px">{{ form.partname }}</div>
            </div>
            <div style="display: flex;">
              <div style="width: 90px">产品规格：</div>
              <div style="width: 100px">{{ form.partspec }}</div>
            </div>
          </div>
          <div style=" display: flex;margin-left: 30px;">
            <div style="display: flex;margin-right: 50px">
              <div style="width: 90px">工序编码：</div>
              <div>{{ form.stepcode }}</div>
            </div>
            <div style="display: flex;">
              <div style="width: 90px">工序名称：</div>
              <div>{{ form.stepname }}</div>
            </div>
          </div>
        </div>
        <div style="margin: 15px 0;font-size: 14px">
          <i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />检验标准信息
        </div>
        <div style="display: flex;align-items: center">
          <div style="width: 90px">检验标准：</div>
          <el-select
            v-model="checkStandard"
            style="width: 200px;"
            placeholder="请选择"
            filterable
            @change="changeCheckStandard"
          >
            <el-option
              v-for="item in checkStandardSelect"
              :key="item.code"
              :label="item.name"
              :value="item.code"
            />
          </el-select>
          <div style="width: 90px;margin-left: 50px;">检验人员：</div>
          <el-select
            v-model="checkUser"
            style="width: 200px;"
            placeholder="请选择"
            filterable
          >
            <el-option
              v-for="item in checkUserSelect"
              :key="item.usercode"
              :label="item.username"
              :value="item.usercode"
            />
          </el-select>
        </div>
        <div style="margin: 15px 0;font-size: 14px">
          <i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />检验项信息
        </div>
        <div>
          <el-button type="primary" @click="add">新增</el-button>
        </div>
        <div style="margin-top: 10px">
          <el-table
            ref="tableDataRef"
            :data="JYTableData"
            :height="(tableHeight-195)+'px'"
            border
            stripe
            :style="{width: 100+'%',height:tableHeight+'px',}"
            highlight-current-row
            :header-cell-style="this.$headerCellStyle"
            :cell-style="this.$cellStyle"
          >
            <el-table-column
              type="index"
              label="序号"
              width="100"
            />
            <!--            <el-table-column-->
            <!--              prop="code"-->
            <!--              label="检验项目编码"-->
            <!--              sortable="custom"-->
            <!--            />-->
            <el-table-column
              prop="code"
              label="检验项目名称(名称)"
            >
              <template slot-scope="{row}">
                <div v-if="row.isVisible===0" style="display: flex;">
                  <div>{{ row.code }}</div>
                  <div style="margin-left: 10px">{{ row.name }}</div>
                </div>

            <el-form-item label="项目描述" style=" display: flex;">
              <el-input v-model="form.itemdescr" style="width: 200px" placeholder="请输入" />
            </el-form-item>
                <el-select
                  v-if="row.isVisible===1"
                  v-model="row.code"
                  filterable
                  style="width: 400px;"
                  placeholder="请选择"
                  @change="val=>changeCode(val,row)"
                >
                  <el-option
                    v-for="item in JYSelectArr"
                    :key="item.code"
                    :label="item.code+''+item.name"
                    :value="item.code"
                  />
                </el-select>
              </template>
            </el-table-column>
            <el-table-column
              prop="stepcheckitem_desc"
              label="检验标准描述"
            >
              <template slot-scope="{row}">
                <el-input v-if="row.isVisible===1" v-model="row.stepcheckitem_desc" placeholder="请输入" />
                <div v-else> {{ row.stepcheckitem_desc }}</div>
              </template>
            </el-table-column>

            <el-table-column
              prop="reslut"
              label="检验结果"
            >
              <template slot-scope="{row}">
                <el-radio-group v-model="row.reslut" size="small" @change="a=>changeRadioValue(a,row)">
                  <el-radio-button style="box-shadow: none" :label="0" @click.native.prevent="clickRadio(0,row)">
                    合格
                  </el-radio-button>
                  <el-radio-button style="box-shadow: none" :label="1" @click.native.prevent="clickRadio(1,row)">
                    不良
                  </el-radio-button>
                </el-radio-group>
              </template>
            </el-table-column>

            <el-table-column
              label="操作"
            >
              <template slot-scope="{row}">
                <div class="operationClass">
                  <el-button v-if="row.isVisible===0" type="text" @click="del(row)">删除</el-button>
                  <el-button v-if="row.isVisible===1" type="text" @click="confirm(row)">确认</el-button>
                  <el-button v-if="row.isVisible===1" type="text" @click="cancel(row)">取消</el-button>
                </div>
              </template>
            </el-table-column>
          </el-table>
        </div>
        <!--   检验结果   和  检验备注      -->
        <div style="display: flex;margin-top: 20px;align-items: center">

          <div style="display: flex;margin-right: 50px;align-items: center">
            <div style="width: 90px">检验结果：</div>
            <el-select
              v-model="checkResult"
              style="width: 200px;"
              placeholder="请选择"
              filterable
            >
              <el-option
                v-for="item in checkResultSelect"
                :key="item.code"
                :label="item.name"
                :value="item.code"
              />
            </el-select>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          <div style="display: flex;align-items: center">
            <div style="width: 90px">检验备注：</div>
            <el-input v-model="checkdescr" style="width: 300px" placeholder="请输入" />
          </div>
        </el-form>

        </div>

        <div style="display: flex;margin: 30px 0;align-items: center">
          <el-button type="primary">首检保存</el-button>
          <el-button type="primary" style="margin-left: 50px">巡检保存</el-button>
          <el-button type="primary" style="margin-left: 50px">完工检保存</el-button>
          <el-button type="info" style="margin-left: 50px">取消</el-button>
        </div>
      </div>
      <el-divider />
      <div style="margin-left: 10px;display: flex">
        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>
        <el-button type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>
      </div>
      <el-divider />
      <div class="elTableDiv">
        <el-table
          :data="tableData"
          :height="tableHeight+'px'"
          border
          stripe
          :style="{width: 100+'%',height:tableHeight+'px',}"
          highlight-current-row
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
          @sort-change="sortChange"
        >
          <!--          <el-table-column-->
          <!--            type="selection"-->
          <!--            width="50"-->
          <!--          />-->
          <el-table-column
            prop="RowNum"
            width="50"
            label="序号"
          />
          <el-table-column
            prop="org_code"
            label="组织编码"
            sortable="custom"
          />
          <el-table-column
            prop="org_name"
            label="组织名称"
            sortable="custom"
          />
          <el-table-column
            prop="description"
            label="组织类型"
            sortable="custom"
          >
            <template slot-scope="{row}">
              <div v-if="row.description==='F'">工厂</div>
              <div v-if="row.description==='D'">部门</div>
              <div v-if="row.description==='W'">车间</div>
              <div v-if="row.description==='K'">科室</div>
              <div v-if="row.description==='L'">生产线</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="parentorg_name"
            label="上级单位"
            sortable="custom"
          />
          <el-table-column
            prop="lm_user"
            label="创建人员"
            sortable="custom"
          />
          <el-table-column
            prop="lm_date"
            label="创建时间"
            sortable="custom"
          />
          <el-table-column
            label="操作"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button type="text" @click="edit('edit',row)">编辑</el-button>
                <el-button type="text" @click="del(row)">删除</el-button>
              </div>
            </template>
          </el-table-column>
        </el-table>
      </div>
      <!--分页-->
      <pagination
        v-show="total>0"
        :total="total"
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="prev, pager, next,sizes"
        popper-class="select_bottom"
        @pagination="getDedectSearch"
      />
    </div>

    <el-dialog
      :title="operation==='add'?'新增':'编辑'"
      :visible.sync="dialogVisible"
      width="800px"
      top="15vh"
      @closed="handleClose"
      @close="handleClose"
    >
      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
        <el-form-item label="项目类型" prop="OrgCode">
          <el-input v-model="dialogForm.OrgCode" :disabled="operation!=='add'" style="width: 200px" />
        </el-form-item>
        <el-form-item label="项目名称" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" style="width: 200px" />
        </el-form-item>
        <el-form-item label="项目描述" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" type="textarea" style="width: 200px" />
        </el-form-item>
      </el-form>
      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
          <el-button @click="dialogVisibleCancel">取 消</el-button>
          <el-button type="primary" @click="dialogVisibleConfirm">确 定</el-button>
        </div>
      </span>
    </el-dialog>
  </div>
</template>

<script>
import Pagination from '@/components/Pagination'
import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import { DedectSearch } from '@/api/zlgl'
// import Pagination from '@/components/Pagination'

const SER_HZ = /^[\u4e00-\u9fa5]+$/
// const SER_HZ = /^[\u4e00-\u9fa5]+$/
import $ from 'jquery'
import {
  MesOrderStepCheckItemList,
  MesOrderStepCheckSearch,
  MesOrderStepCheckSelect,
  StepCheckItemSelect
} from '@/api/zlgl'
import { MesOrderSelectUser } from '@/api/scgl'

export default {
  name: 'GXJY',
  components: {
    Pagination
  },
  name: 'QXDY',
  // components: {
  //   Pagination
  // },
  data() {
    const validateName = (rule, value, callback) => {
      if (!value) {
        return callback(new Error('请输入编码'))
      } else {
        if (SER_HZ.test(value)) {
          return callback(new Error('编码不能为中文'))
        } else {
          callback()
        }
      }
    }
    return {
      mainHeight: 0,
      tableHeight: 0,
      form: {
        itemcode: '', // 项目代码
        itemname: '', // 项目名称
        itemdescr: '', // 项目描述
        prop: 'lm_date', // 排序字段
        order: 'desc', // 排序字段
        page: 1, // 第几页
        rows: 20 // 每页多少条
      form: { // 工序
        orderstepqrcode: 'MO-2022-07-0001_1;001', // 扫描的二维码信息
        wo_code: '', // 工单编码
        partcode: '', // 产品编码
        partname: '', // 产品名称
        partspec: '', // 产品规格
        stepcode: '', // 工序编码
        stepname: ''// 工序名称
      },
      OrgTypeArr: [
        { label: '工厂', value: 'F' },
        { label: '部门', value: 'D' },
        { label: '车间', value: 'W' },
        { label: '科室', value: 'K' },
        { label: '生产线', value: 'L' }
      ],
      checkStandard: '', // 检验标准
      checkStandardSelect: [], // 检验标准下拉数组
      checkUser: '', // 检验人员
      checkUserSelect: [], // 检验人员下拉数组
      checkResult: '', // 检验结果
      checkResultSelect: [
        { code: 'OK', name: '合格' },
        { code: 'NG', name: '不良' }
      ], // 检验结果下拉数组
      checkdescr: '', // 检验备注（描述）

      total: 10,
      tableData: [],
      dialogVisible: false,
      dialogForm: {
        OrgType: '',
        OrgCode: '',
        OrgName: '',
        SupUnit: ''// 上级单位
      },
      operation: '',
      dialogFormRules: {
        OrgType: [
          { required: true, message: '请输入选择类型', trigger: ['blur', 'change'] }
        ],
        OrgCode: [
          { required: true, validator: validateName, trigger: ['blur', 'change'] }
        ],
        OrgName: [
          { required: true, message: '请输入名称', trigger: ['blur', 'change'] }
        ]

      }

      JYTableData: [], // 检验项信息表格
      JYSelectArr: [], // 检验下拉数组
      JYSelectedArr: [] // 已选检验项目数组
      // checkresultArr:[
      //   {''}
      // ]
    }
  },
  created() {
    this.getDedectSearch()
    this.getMesOrderStepCheckSelect()
    this.getMesOrderSelectUser()
    this.getJYSelectArr()
  },
  mounted() {
    window.addEventListener('resize', this.getHeight)
    this.getHeight()

    this.getFocus()
  },
  methods: {
    async getDedectSearch() {
      const res = await DedectSearch(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.getDedectSearch()
    },
    // 查询
    search() {
      this.getDedectSearch()
    },
    upload() {

    },
    // 重置
    reset() {
      this.form.OrgCode = ''
      this.form.OrgName = ''
      this.form.OrgType = ''
      this.form.UserName = ''
      this.getDedectSearch()
    },

    // 新增按钮
    add(operation) {
      this.operation = operation
      this.dialogVisible = true
    },
    // 修改按钮
    edit(operation, row) {
      this.operation = operation
      this.dialogVisible = true

    // 获取聚焦
    getFocus() {
      this.$nextTick(() => {
        this.dialogForm.OrgCode = row.org_code
        this.dialogForm.OrgName = row.org_name
        this.dialogForm.SupUnit = row.parent_id
        $("input[name='GXproduceCode']")[0].focus()
      })
    },
    // 删除按钮
    async del(row) {
      this.$confirm('是否确认删除?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        DeleteOrganization({ orgid: row.code }).then(res => {
          if (res.code === '200') {
            this.$message.success('删除成功!')
            this.getDedectSearch()
          }
        })
      }).catch(() => {
        this.$message.info('已取消删除')
    // 获取检验标准下拉数组
    async getMesOrderStepCheckSelect() {
      const { data: res } = await MesOrderStepCheckSelect()
      this.checkStandardSelect = res
    },
    // 获取检验人员下拉
    async getMesOrderSelectUser() {
      const { data: res } = await MesOrderSelectUser()
      this.checkUserSelect = res
    },
    // 获取检验项下拉数组
    async getJYSelectArr() {
      const { data: res } = await StepCheckItemSelect()
      this.JYSelectArr = res
    },
    // 检验标准下拉值改变
    async changeCheckStandard(val) {
      this.JYSelectedArr = []
      const { data: res } = await MesOrderStepCheckItemList({ checkstandcode: val })
      this.JYTableData = res

      this.JYTableData.forEach(item => {
        let number = Math.random() * Math.random()// 作为删除时的标识符
        number = number === 0 ? (10 + Math.random()) : number

        item.reslut = 0 // 0合格  1不良

        item.isVisible = 0
        item.number = number
        this.JYSelectedArr.push(item.code)
      })
    },
    // 对话框关闭事件
    handleClose() {
      this.dialogForm.OrgType = ''
      this.dialogForm.OrgCode = ''
      this.dialogForm.OrgName = ''
      this.dialogForm.SupUnit = ''
      this.$refs.dialogForm.clearValidate()
    changeRadioValue(val, row) {
      console.log(val, row)
    },
    // 对话框取消
    dialogVisibleCancel() {
      this.dialogVisible = false
    clickRadio(e, row) {
      console.log(e, row, 1)
      row.reslut = row.reslut === 0 ? 1 : 0
      // this.JYTableData.forEach(item => {
      //   if (row.code === item.code) {
      //     item.reslut = row.reslut === 0 ? 1 : 0
      //   }
      // })
      // e === row.reslut ? row.reslut = null : row.reslut = e
      // this.$nextTick(() => {
      //   row.reslut = row.reslut === 0 ? 1 : 0
      // })
      //
      // this.$forceUpdate()

      // this.$refs.tableDataRef.toggleRowSelection(row, 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.getDedectSearch()
            } else {
              this.$message.error(this.operation === 'add' ? '添加失败！' : '修改失败！')
            }

    reslutChange(val, row) {

    },
    xxxx(val) {
      console.log(val)
    },
    changeSelect(val, row) {
      console.log(val, row)
    },
    changSwitch(val, row) {
      console.log(val)
      // row.result = val
      // this.JYTableData.forEach(item => {
      //   if (row.code === item.code) {
      //     item.reslut = val === 'NG' ? 'OK' : 'NG'
      //   }
      // })

      // row.reslut = !row.reslut
      // this.handleValue(row)
    },
    handleValue(row) {
      this.JYTableData.forEach(item => {
        if (item.code === row.code) {
          item.reslut = item.reslut === 'OK' ? 'NG' : 'OK'
        }
      })
    },
    //
    changeCode(val, row) {
      row.stepcheckitem_desc = this.JYSelectArr.find(it => it.code === val).descr
      row.name = this.JYSelectArr.find(it => it.code === val).name
    },
    // 扫码键盘回车事件
    async enterNative(val, belong) {
      if (belong === 'GXproduceCode') {
        const res = await MesOrderStepCheckSearch({ orderstepqrcode: this.form.orderstepqrcode })
        this.form.wo_code = res.data[0].wo_code
        this.form.partcode = res.data[0].partcode
        this.form.partname = res.data[0].partname
        this.form.partspec = res.data[0].partspec
        this.form.stepcode = res.data[0].stepcode
        this.form.stepname = res.data[0].stepname
      }
    },

    //  新增
    add() {
      if (this.JYTableData.length > 0 && this.JYTableData[this.JYTableData.length - 1].isVisible === 1) {
        return this.$message.info('请先确定或取消本条记录！')
      }

      let number = Math.random() * Math.random()// 作为删除时的标识符
      number = number === 0 ? (10 + Math.random()) : number
      const data = { code: '', name: '', stepcheckitem_desc: '', isVisible: 1, number }
      this.JYTableData.push(data)
    },

    //  确认
    confirm(row) {
      if (row.code === '') {
        return this.$message.info('检验标准编码(名称)不能为空！')
      }

      if (this.JYSelectedArr.find(item => item === row.code) !== undefined) {
        return this.$message.info('检验标准编码(名称)不能重复！')
      } else {
        this.JYSelectedArr.push(row.code)
      }

      this.JYTableData.forEach((item, index) => {
        if (item.number === row.number) {
          item.isVisible = 0
          this.JYTableData.splice(index, 1, {
            number: row.number,
            code: row.code,
            name: row.name,
            isVisible: 0,
            reslut: row.reslut,
            stepcheckitem_desc: row.stepcheckitem_desc
          })
        }
      })

      console.log(this.JYTableData)
    },
    //  取消
    cancel(row) {
      this.JYTableData.forEach((item, index) => {
        if (item.number === row.number) {
          this.JYTableData.splice(index, 1)
        }
      })

      this.JYSelectedArr.forEach((item, index) => {
        if (item === row.code) {
          this.JYSelectedArr.splice(index, 1)
        }
      })
    },
    // 删除
    del(row) {
      this.JYTableData.forEach((item, index) => {
        if (item.number === row.number) {
          this.JYTableData.splice(index, 1)
        }
      })

      this.JYSelectedArr.forEach((item, index) => {
        if (item === row.code) {
          this.JYSelectedArr.splice(index, 1)
        }
      })
    },
@@ -346,9 +470,11 @@
  border: none;
  padding: 0 20px;
}

::v-deep .el-button--primary:hover {
  border: none;
}

::v-deep .el-button--info {
  height: 30px;
  display: flex;
@@ -404,6 +530,7 @@
  height: 30px;
  line-height: 30px;
}

::v-deep .el-input__inner:focus {
  border-color: $main_color;
}
@@ -480,18 +607,25 @@
  border-color: $main_color;
}

::v-deep .el-select .el-input__inner:focus{
::v-deep .el-select .el-input__inner:focus {
  border-color: $main_color;
}

::v-deep .el-select-dropdown__item.selected{
::v-deep .el-select-dropdown__item.selected {
  color: $main_color;
}
::v-deep .el-checkbox__inner:hover{
  border-color: $main_color;
}
::v-deep .el-textarea__inner:focus{

::v-deep .el-checkbox__inner:hover {
  border-color: $main_color;
}

::v-deep .el-textarea__inner:focus {
  border-color: $main_color;
}

::v-deep .el-select .el-input .el-select__caret {
  display: flex;
  align-items: center;
  justify-content: center;
}
</style>