1.修改bug 2.正在开发缺陷定义

loulijun2021

2022-07-20 95fb18f99827a5eeefa1ebf661c6f6459646b87b

 src/views/zlgl/gxjybz.vue

@@ -109,21 +109,29 @@
      :visible.sync="dialogVisible"
      width="800"
      top="15vh"
      :close-on-click-modal="false"
      @closed="handleClose"
      @close="handleClose"
    >
      <div style="margin-bottom: 10px">
        <i class="el-icon-s-comment" style="color:#42b983;" /> 标准信息：
      </div>
      <el-form ref="dialogForm" style="margin-left: 80px" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
      <el-form
        ref="dialogForm"
        style="margin-left: 80px"
        inline
        :rules="dialogFormRules"
        :model="dialogForm"
        label-width="80px"
      >
        <el-form-item label="标准编码" prop="code">
          <el-input v-model="dialogForm.code" :disabled="operation!=='add'" style="width: 200px" />
        </el-form-item>
        <el-form-item label="标准名称" prop="name">
          <el-input v-model="dialogForm.name" style="width: 200px" />
          <el-input v-model="dialogForm.name" :disabled="operation==='check'" style="width: 200px" />
        </el-form-item>
        <el-form-item label="描述">
          <el-input v-model="dialogForm.description" type="textarea" style="width: 200px" />
          <el-input v-model="dialogForm.description" :disabled="operation==='check'" type="textarea" style="width: 200px" />
        </el-form-item>
      </el-form>
      <div style="margin-bottom: 10px">
@@ -150,52 +158,56 @@
          />
          <el-table-column
            prop="code"
            label="检验标准编码"
            label="检验标准编码(名称)"
          >
            <template slot-scope="{row}">
              <div v-if="row.isVisible===0">{{ row.code }}</div>
              <div v-if="row.isVisible===0" style="display: flex;">
                <div>{{ row.code }}</div>
                <div style="margin-left: 10px">{{ row.name }}</div>
              </div>

              <el-select
                v-if="row.isVisible===1"
                v-model="row.code"
                filterable
                :popper-append-to-body="false"
                style="width: 200px;"
                style="width: 400px;"
                placeholder="请选择"
                @change="val=>changeCode(val,row)"
              >
                <el-option
                  v-for="item in JYSelectArr"
                  :key="item.code"
                  :label="item.code"
                  :label="item.code+''+item.name"
                  :value="item.code"
                />
              </el-select>
            </template>
          </el-table-column>
          <el-table-column
            prop="name"
            label="检验标准名称"
          >
            <template slot-scope="{row}">
              <div v-if="row.isVisible===0">{{ row.name }}</div>
              <el-select
                v-if="row.isVisible===1"
                v-model="row.name"
                filterable
                :popper-append-to-body="false"
                style="width: 200px;"
                placeholder="请选择"
                @change="val=>changeName(val,row)"
              >
                <el-option
                  v-for="item in JYSelectArr"
                  :key="item.code"
                  :label="item.name"
                  :value="item.code"
                />
              </el-select>
            </template>
          </el-table-column>
          <!--          <el-table-column-->
          <!--            prop="name"-->
          <!--            label="检验标准名称"-->
          <!--          >-->
          <!--            <template slot-scope="{row}">-->
          <!--              <div v-if="row.isVisible===0">{{ row.name }}</div>-->
          <!--              <el-select-->
          <!--                v-if="row.isVisible===1"-->
          <!--                v-model="row.name"-->
          <!--                filterable-->
          <!--                :popper-append-to-body="false"-->
          <!--                style="width: 200px;"-->
          <!--                placeholder="请选择"-->
          <!--                @change="val=>changeName(val,row)"-->
          <!--              >-->
          <!--                <el-option-->
          <!--                  v-for="item in JYSelectArr"-->
          <!--                  :key="item.code"-->
          <!--                  :label="item.name"-->
          <!--                  :value="item.code"-->
          <!--                />-->
          <!--              </el-select>-->
          <!--            </template>-->
          <!--          </el-table-column>-->
          <el-table-column
            prop="descr"
            label="检验描述描述"
@@ -206,6 +218,7 @@
            </template>
          </el-table-column>
          <el-table-column
            v-if="operation!=='check'"
            label="操作"
          >
            <template slot-scope="{row}">
@@ -222,8 +235,9 @@

      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
          <el-button @click="dialogVisibleCancel">取 消</el-button>
          <el-button type="primary" @click="dialogVisibleConfirm">提 交</el-button>
          <el-button v-if="operation==='check'" @click="dialogVisibleCancel">返 回</el-button>
          <el-button v-if="operation!=='check'" @click="dialogVisibleCancel">取 消</el-button>
          <el-button v-if="operation!=='check'" type="primary" @click="dialogVisibleConfirm">提 交</el-button>
        </div>
      </span>
    </el-dialog>
@@ -232,9 +246,13 @@

<script>
import Pagination from '@/components/Pagination'
import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import { AddUpdateStepCheckStaned, StepCheckItemSelect, StepCheckStanedSearch } from '@/api/zlgl'
import { DeleteOrganization } from '@/api/jcsz'
import {
  AddUpdateStepCheckStaned, DeleteStepCheckStaned,
  EditStepCheckStanedSearch,
  StepCheckItemSelect,
  StepCheckStanedSearch
} from '@/api/zlgl'

const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -294,7 +312,6 @@
      JYTableData: [], // 对话框检验信息表格
      JYSelectArr: [], // 检验项目下拉数组
      JYSelectedArr: [] // 已选检验项目数组
      // JYAddFlag: true // 是否可进行添加
    }
  },
  created() {
@@ -348,17 +365,28 @@
    edit(operation, row) {
      this.operation = operation
      this.dialogVisible = true

      this.$nextTick(() => {
        this.dialogForm.OrgCode = row.code
        this.dialogForm.OrgName = row.name
        this.dialogForm.SupUnit = row.descr
      })
      this.getEditStepCheckStanedSearch(row.code)
    },
    // 查看
    check(operation, row) {
      this.operation = operation
      this.dialogVisible = true
      this.getEditStepCheckStanedSearch(row.code)
    },
    async getEditStepCheckStanedSearch(val) {
      const { data: res } = await EditStepCheckStanedSearch({ defectcode: val })
      this.dialogForm.code = res.code
      this.dialogForm.name = res.name
      this.dialogForm.description = res.description
      this.JYTableData = res.Data
      this.JYTableData.forEach(item => {
        let number = Math.random() * Math.random()// 作为删除时的标识符
        number = number === 0 ? (10 + Math.random()) : number
        item.isVisible = 0
        item.descr = item.stepcheckitem_desc
        item.number = number
        this.JYSelectedArr.push(item.code)
      })
    },
    // 删除按钮
    async del(row) {
@@ -367,7 +395,7 @@
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        DeleteOrganization({ orgid: row.code }).then(res => {
        DeleteStepCheckStaned({ stanedcode: row.code }).then(res => {
          if (res.code === '200') {
            this.$message.success('删除成功!')
            this.getStepCheckStanedSearch()
@@ -393,7 +421,6 @@
    },
    // 对话框确认
    dialogVisibleConfirm() {
      console.log(this.JYSelectedArr.map(i => i))
      this.$refs.dialogForm.validate(valid => {
        if (valid) {
          const tableData = []
@@ -431,21 +458,20 @@
      })
    },
    // 获取检验项目下拉列表
    async  getStepCheckItemSelect() {
    async getStepCheckItemSelect() {
      const { data: res } = await StepCheckItemSelect()
      this.JYSelectArr = res
    },
    // 检验标准编码值改变
    changeCode(val, row) {
      console.log(this.JYSelectedArr.map(i => i))
      row.name = this.JYSelectArr.find(it => it.code === val).name
      row.descr = this.JYSelectArr.find(it => it.code === val).descr
    },
    // 检验标准名称值改变
    changeName(val, row) {
      row.code = this.JYSelectArr.find(it => it.code === val).code
      row.descr = this.JYSelectArr.find(it => it.code === val).descr
    },
    // changeName(val, row) {
    //   row.code = this.JYSelectArr.find(it => it.code === val).code
    //   row.descr = this.JYSelectArr.find(it => it.code === val).descr
    // },
    // 检验新增
    JYadd() {
      if (this.JYTableData.length > 0 && this.JYTableData[this.JYTableData.length - 1].isVisible === 1) {
@@ -485,28 +511,30 @@
    },
    JYsave(row) {
      if (row.code === '') {
        return this.$message.info('检验标准代码不能为空！')
        return this.$message.info('检验标准编码(名称)不能为空！')
      }
      if (row.name === '') {
        return this.$message.info('检验标准名称不能为空！')
      }
      // if (row.name === '') {
      //   return this.$message.info('检验标准名称不能为空！')
      // }

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

      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, descr: row.descr })
          this.JYTableData.splice(index, 1, {
            number: row.number,
            code: row.code,
            name: row.name,
            isVisible: 0,
            descr: row.descr
          })
        }
      })
      console.log(this.JYTableData, 898989)
    },
    JYcancel(row) {
      this.JYTableData.forEach((item, index) => {
@@ -536,9 +564,11 @@
  border: none;
  padding: 0 20px;
}

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

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

::v-deep .el-input__inner:focus {
  border-color: $main_color;
}
@@ -674,21 +705,23 @@
  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-select__caret{
::v-deep .el-textarea__inner:focus {
  border-color: $main_color;
}

::v-deep .el-select__caret {
  display: flex;
  align-items: center;
  justify-content: center;