原辅材修改

spring

2025-04-11 fe2c38273024c74f28e59c24c867eb67c841be16

 src/views/business/materialOrder/customsInspection.vue

@@ -136,6 +136,11 @@
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item class="addObj-form-item" label="车间名称:">
              <el-input v-model="addObj.workShopName" class="addObj-info" clearable disabled size="small"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item class="addObj-form-item" label="备注:">
              <el-input v-model="addObj.remark" :autosize="{ minRows: 2, maxRows: 2 }" :disabled="active > 1"
                :placeholder="active > 1 ? '' : '请输入'" clearable size="small" type="textarea"></el-input>
@@ -148,31 +153,21 @@
      <div style="display: flex;justify-content: space-between;background-color: #F5F7FB;margin-bottom: 6px">
        <div v-if="active == 1">
          <el-form :inline="true" :model="addObj1" label-width="90px">
            <el-form-item label="样品型号:" style="margin-bottom: 6px;margin-top: 6px">
              <el-select v-model="model" :placeholder="active > 1 ? '' : '请输入'" allow-create clearable
                default-first-option filterable size="small" @change="changeModel">
                <el-option v-for="item in models" :key="item.value" :label="item.label" :value="item.value">
                </el-option>
              </el-select>
            </el-form-item>
            <el-form-item label="检验标准:" style="margin-bottom: 6px;margin-top: 6px">
              <el-select v-model="standardMethodListId" :loading="methodLoad" :placeholder="active > 1 ? '' : '请输入'"
                clearable size="small" @change="changeStandardMethodListId" @focus="methodFocus">
                <el-option v-for="item in methods" :key="item.id" :label="item.code" :value="item.id">
                </el-option>
              </el-select>
            </el-form-item>
            <el-form-item label="附件查看:" style="margin-bottom: 6px;margin-top: 6px">
              <el-button type="text" @click="handleFileDialog">
                <i class="el-icon-document"></i>
                附件查看
                车间附件查看
              </el-button>
              <el-dialog :visible.sync="fileDialogVisible" title="附件查看" width="80%">
                <fileList :currentNo="partNo" v-if="fileDialogVisible" />
              </el-dialog>
            </el-form-item>
          </el-form>
        </div>
        <el-button type="text" @click="handleFileDialog" v-show="active != 1">
          <i class="el-icon-document"></i>
          车间附件查看
        </el-button>
        <el-dialog :visible.sync="fileDialogVisible" title="附件查看" width="80%">
          <fileList :currentNo="addObj.workShopId" v-if="fileDialogVisible" :isLook="true" />
        </el-dialog>
        <div style="margin-bottom: 6px;margin-top: 6px">
          <el-button v-show="active == 1" :disabled="sampleList.length === 2" size="small" type="primary"
            @click="handleSplitCountNum">拆分</el-button>
@@ -218,7 +213,7 @@
            <el-select v-model="scope.row.standardMethodListId"
              :disabled="scope.row.model == null || active > 1 || scope.$index !== 0" :loading="methodLoad" clearable
              placeholder="检验标准" size="small" style="width: 100%;" @change="(value) => methodChange(value, scope.row)"
              @clear="productList = []" @focus="methodFocus">
              @clear="productList = []" @focus="methodFocus" multiple>
              <el-option v-for="item in methods" :key="item.id" :label="item.code" :value="item.id">
              </el-option>
            </el-select>
@@ -293,7 +288,7 @@
            </span>
          </template>
        </el-table-column>
        <el-table-column label="条件" min-width="140" prop="radius" show-overflow-tooltip></el-table-column>
        <el-table-column label="试验条件" min-width="140" prop="radius" show-overflow-tooltip></el-table-column>
        <el-table-column label="试验方法" min-width="120" prop="methodS" show-overflow-tooltip>
          <template slot="header" slot-scope="scope">
            <div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
@@ -419,7 +414,7 @@
  selectStandardProductList,
  selectStandardTreeListByPartNo
} from "@/api/business/rawMaterialOrder";
import fileList from "./commom/fileList.vue"
import fileList from "../../structural/capabilityAndLaboratory/workshop/components/fileList.vue"
import limsTable from "@/components/Table/lims-table.vue";

export default {
@@ -477,6 +472,8 @@
        typeSource: 1,
        ifsInventoryId: '',
        sampleStatus: 'In good condition',
        workShopName: '',//车间名称
        workShopId: '',//车间ID
      },
      addObjRules: { // 表单校验规则
        testQuantity: [
@@ -528,7 +525,7 @@
      totalArr: [],
      addObj1: {},
      model: null,
      standardMethodListId: null,
      standardMethodListId: [],
      inspectionItem: null,
      inspectionItemSubclass: null,
      methodS: null,
@@ -560,7 +557,7 @@
          value: 0
        },
        {
          label: '季度检验',
          label: '可靠性检验',
          value: 1
        },
      ],
@@ -603,11 +600,11 @@
    },
    'addObj.sample'(val) {
      this.model = null
      this.standardMethodListId = null
      this.standardMethodListId = []
    },
    'addObj.qtyArrived'(val) {
      this.model = null
      this.standardMethodListId = null
      this.standardMethodListId = []
    }
  },
  created() {
@@ -632,7 +629,6 @@
  methods: {
    handleFileDialog() {
      this.fileDialogVisible = true
      this.currentNo = addObj.partNo || customsInspection.partNo;
    },
    save1() {
      if (this.bsm1DiaList.length > 0) {
@@ -710,6 +706,11 @@
            this.addObj.updateBatchNo = res.data.insOrderTemplate.updateBatchNo
            this.addObj.type = String(this.addObj.type)
            this.sampleList = this.HaveJson(res.data.sampleProduct)
            this.sampleList.forEach(m => {
              if (m.standardMethodListId) {
                m.standardMethodListId = JSON.parse(m.standardMethodListId)
              }
            })
            this.getProNum()
            this.$nextTick(() => {
              this.$refs.sampleTable.doLayout()
@@ -749,6 +750,9 @@
            this.$set(this.addObj, 'buyUnitMeas', this.customsInspection.buyUnitMeas)
            this.$set(this.addObj, 'updateBatchNo', this.customsInspection.updateBatchNo)
            this.$set(this.addObj, 'partDetail', this.customsInspection.partDesc)
            this.$set(this.addObj, 'workShopName', res.data.workShopName)
            this.$set(this.addObj, 'workShopId', res.data.workShopId)
            this.$set(this.addObj, 'inspectionType', this.customsInspection.inspectionType)
            if (this.orderType == 1) {
              this.$set(this.addObj, 'orderType', 'Quarterly inspection')
            }
@@ -887,7 +891,7 @@
    save() {
      this.$refs['addObj'].validate((valid) => {
        if (valid) {
          if (!this.sampleList.every(m => m.standardMethodListId)) {
          if (!this.sampleList.every(m => m.standardMethodListId && m.standardMethodListId.length > 0)) {
            this.$message.error('请选择检验标准')
            return
          }
@@ -896,7 +900,7 @@
            item.insProduct = this.productList
          })
          this.getTotal(sampleList)
          let projectNum = this.totalArr.filter(a => a.state == 1).length
          let projectNum = this.totalArr.length
          if (projectNum == 0) {
            this.$confirm('检验项目为空，是否确认提交?', "提示", {
              confirmButtonText: "确定",
@@ -941,7 +945,7 @@
    noNeedCheck() {
      this.$refs['addObj'].validate((valid) => {
        if (valid) {
          if (!this.sampleList.every(m => m.standardMethodListId)) {
          if (!this.sampleList.every(m => m.standardMethodListId && m.standardMethodListId.length > 0)) {
            this.$message.error('请选择检验标准')
            return
          }
@@ -1036,13 +1040,13 @@
        delete this.addObj.createTime
      }
      addInsOrder({
        insOrder: this.addObj,
        insOrder: {
          ...this.addObj,
          workShopId: this.addObj.workShopId || ''  // 确保 workShopId 传递给后端
        },
        sampleList: sampleList.map(a => {
          if (a.insProduct.length > 0) {
            a.insProduct.forEach(c => {
              delete c.id
            })
          }
          a.standardMethodListId = JSON.stringify(a.standardMethodListId)
          a.insProduct = this.productList
          if (a.modelNum) {
            // 根据x号判断型号参数与样品型号的拼接位置
            // 例如×4，就为500ML×4；4×，就为4×500ML
@@ -1057,7 +1061,6 @@
          } else {
            a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ? '' : ('-' + a.modelNum))
          }
          a.insProduct = a.insProduct.filter(b => b.state === 1)
          return a
        }),
      }).then(res => {
@@ -1455,19 +1458,18 @@
      this.sample.joinNum = 1
      this.sample.sample = this.addObj.sample
      this.sample.unit = this.addObj.unit
      this.sample.standardMethodListId = null
      this.sample.standardMethodListId = []
      this.sample.insProduct = []
      this.sample.id = this.count
      this.sample.childSampleList = []
      this.sample.insulating = null
      this.sample.sheath = null
      this.sample.quantity = 1
      console.log(2222, codeLevel, data)
      if (codeLevel === '[5]') {
      if (codeLevel === '[7]') {
        this.sample.model = this.addObj.sample
      } else if (codeLevel === '[4]') {
      } else if (codeLevel === '[6]') {
        this.models = data.children2
      } else if (codeLevel === '[3]') {
      } else if (codeLevel === '[5]') {
        this.models = data.children1
      }
      this.sampleList.push(this.HaveJson(this.sample))
@@ -1491,12 +1493,12 @@
    // 选中表格行的回调
    rowClick(row, column, event) {
      this.currentMethod = row
      let obj = this.methods.find(a => a.id == this.currentMethod.standardMethodListId)
      if (obj && obj.code == '技术要求') {
        this.isAskOnlyRead = true
      } else {
        this.isAskOnlyRead = false
      }
      // let obj = this.methods.find(a => a.id == this.currentMethod.standardMethodListId)
      // if (obj && obj.code == '技术要求') {
      //   this.isAskOnlyRead = true
      // } else {
      //   this.isAskOnlyRead = false
      // }
      this.sampleId = row.id
      if (this.active !== 1) {
        this.sampleIds = []
@@ -1566,29 +1568,34 @@
        })
      }
      this.currentMethod = row
      let obj = this.methods.find(a => a.id == this.currentMethod.standardMethodListId)
      if (obj && obj.code == '技术要求') {
        this.isAskOnlyRead = true
      } else {
        this.isAskOnlyRead = false
      }
      // let obj = this.methods.find(a => a.id == this.currentMethod.standardMethodListId)
      // if (obj && obj.code == '技术要求') {
      //   this.isAskOnlyRead = true
      // } else {
      //   this.isAskOnlyRead = false
      // }
      this.getProductLoad = true
      let selectTreeList = this.selectTree.split(" - ")
      this.addObj.model && (selectTreeList[selectTreeList.length - 1] = this.addObj.model)
      selectStandardProductList({
        model: this.addObj.model ? this.addObj.model : row.model,
        modelNum: row.modelNum,
        standardMethodListId: val,
        standardMethodListIds: val,
        factory: selectTreeList.join(" - "),
        partNo: this.addObj.partNo,
        ifsInventoryId: this.customsInspection.id
      }).then(res => {
        this.getProductLoad = false
        res.data.forEach(a => {
          a.state = 0
        // 直接将查询结果赋值给 productList
        // this.fullProductList = res.data
        this.productList = res.data.map(m => {
          m.state = 1
          return m
        })
        this.productList = this.HaveJson(res.data)
        this.productList0 = JSON.parse(JSON.stringify(this.productList))
        this.productList0 = res.data.map(m => {
          m.state = 1
          return m
        })
        this.$refs.sampleTable.setCurrentRow(row)
        setTimeout(() => {
          this.productList.forEach(a => {
@@ -1597,25 +1604,6 @@
        }, 200)
      }).catch(err => {
        console.log('err-', err)
      })
    },
    // 选择样品型号的回调
    changeModel() {
      this.sampleList.forEach(a => {
        let obj = this.sampleIds.find(b => b == a.id)
        if (obj) {
          a.model = this.model
        }
      })
    },
    // 选择检验标准的回调
    changeStandardMethodListId() {
      this.sampleList.forEach(a => {
        let obj = this.sampleIds.find(b => b == a.id)
        if (obj) {
          a.standardMethodListId = this.standardMethodListId
          this.methodChange(this.standardMethodListId, a)
        }
      })
    },
    // 拼接样品树的字符串
@@ -1683,129 +1671,6 @@
      }
      this.changeProductList0()
      this.currentMethod.insProduct = this.productList0
    },
    // 单选选择检验项的回调
    selectOne(selection, row) {
      this.bsm1DiaList = []
      row.state = row.state == 1 ? 0 : 1
      if (row.section === null) {
        row.section = ""
      }
      if (row.sectionCopy === undefined && row.section) {
        if (row.section.indexOf('[') > -1) {
          this.$set(row, 'sectionCopy', row.section)
        }
      }
      if (row.ask.includes('[')) {
        this.$set(row, 'askCopy', row.ask)
      }
      if (row.tell.includes('[')) {
        this.$set(row, 'tellCopy', row.tell)
      }
      let arr = this.productList.filter(m => m.state == 1 && row.sectionCopy && row.sectionCopy.includes(m.sectionCopy) && m.ask && m.sectionCopy.indexOf('[') == -1)
      if (row.bsm === '1' && row.sectionCopy !== '' && row.sectionCopy !== null && row.sectionCopy !== undefined && row.state === 1 && arr.length == 0) {
        if (row.sectionCopy.indexOf('[') > -1) {
          row.bsmRow = this.HaveJson(row)
        }
        row.bsm1 = true
        this.bsm1DiaList.push(row)
        this.bsm1DiaAll = true
      } else if (row.bsm === '1' && row.sectionCopy !== '' && row.sectionCopy !== null && row.state === 0 && arr.length == 0) {
        row.bsm1 = false
      } else if (arr.length > 0) {
        try {
          row.bsmRow = this.HaveJson(row)
          let section = arr[0].section
          let arr0 = JSON.parse(row.section)
          let arr1 = JSON.parse(row.ask)
          let arr4 = JSON.parse(row.tell)
          let index = arr0.indexOf(section)
          row.section = section
          row.ask = arr1[index]
          row.tell = arr4[index]
        } catch (e) { }
      }
      this.sampleList.map(item => {
        if (this.sampleIds.indexOf(item.id) > -1) {
          item.insProduct.map(m => {
            if (m.id == row.id) {
              m.state = row.state;
            }
            return m;
          })
        }
        return item
      })
      this.changeProductList0()
      this.currentMethod.insProduct = this.productList0
      this.getProNum()
    },
    handleAll(e) {
      if (e.length > 0) {
        this.productList.map(m => {
          if (e.find(a => a.id == m.id)) {
            m.state = 1
          }
          return m
        })
      } else {
        this.productList.map(m => {
          m.state = 0
          return m
        })
      }
      this.bsmRow3 = [];
      this.bsm1DiaList = []
      this.productList.forEach(p => {
        if (p.sectionCopy === undefined && p.section) {
          if (p.section.indexOf('[') > -1) {
            this.$set(p, 'sectionCopy', p.section)
          }
        }
        if (p.ask.includes('[')) {
          this.$set(p, 'askCopy', p.ask)
        }
        if (p.tell.includes('[')) {
          this.$set(p, 'tellCopy', p.tell)
        }
        if (p.bsm === '1' && p.sectionCopy !== '' && p.sectionCopy !== null && p.sectionCopy !== undefined && p.state === 1) {
          if (p.sectionCopy.indexOf('[') > -1) {
            p.bsmRow = this.HaveJson(p)
          }
          p.bsm1 = true
          this.bsm1DiaList.push(p)
          this.bsm1DiaAll = true
        } else if (p.bsm === '1' && p.sectionCopy !== '' && p.sectionCopy !== null && p.state === 0) {
          p.bsm1 = false
        }
      })
      if (e.length > 0) {
        this.sampleList.map(item => {
          if (this.sampleIds.indexOf(item.id) > -1) {
            item.insProduct.map(m => {
              m.state = 1
              return m;
            })
          }
          return item
        })
      } else {
        this.sampleList.map(item => {
          if (this.sampleIds.indexOf(item.id) > -1) {
            item.insProduct.map(m => {
              m.state = 0
              return m;
            })
          }
          return item
        })
      }
      this.changeProductList0()
      this.currentMethod.insProduct = this.productList0
      this.getProNum()
      this.$nextTick(() => {
        this.$refs.productTable.doLayout()
      })
    },
    changeProductList0() {
      this.productList0.forEach(a => {