src/main.js

@@ -66,7 +66,7 @@
Vue.prototype.HaveJson = (val) => {
  return JSON.parse(JSON.stringify(val));
};
Vue.prototype.javaApi = "http://10.21.10.78:8089";
Vue.prototype.javaApi = "http://192.168.18.50:7002"; //测试库：192.168.18.50:7002
Vue.prototype.checkPermi = checkPermi;
Vue.prototype.uploadHeader = {
  Authorization: "Bearer " + getToken(),

 src/views/business/materialOrder/customsInspection.vue

@@ -971,19 +971,19 @@
      })
      this.getTotal(sampleList)
      let trees = this.selectTree.split(" - ")
      if (trees.length < 3) {
      if (trees.length < 5) {
        this.$message.error('未选择对象')
        return
      }
      this.addObj.factory = trees[0]
      this.addObj.laboratory = trees[1]
      this.addObj.sampleType = trees[2]
      if ((trees[3] === undefined || trees[3] === '') || trees.length === 4) {
        this.addObj.sample = trees[2]
      this.addObj.sampleType = trees[3]
      if ((trees[5] === undefined || trees[5] === '') || trees.length === 6) {
        this.addObj.sample = trees[4]
      } else {
        this.addObj.sample = trees[3]
        this.addObj.sample = trees[5]
      }
      this.addObj.model = (trees[4] == undefined ? null : trees[4])
      this.addObj.model = (trees[6] == undefined ? null : trees[6])
      this.addObj.ifsInventoryId = this.customsInspection.id
      this.noNeedCheckLoad = true
      addExemptionOrder({
@@ -1017,19 +1017,19 @@
    },
    saveMethod(sampleList) {
      let trees = this.selectTree.split(" - ")
      if (trees.length < 3) {
      if (trees.length < 5) {
        this.$message.error('未选择对象')
        return
      }
      this.addObj.factory = trees[0]
      this.addObj.laboratory = trees[1]
      this.addObj.sampleType = trees[2]
      if ((trees[3] === undefined || trees[3] === '') || trees.length === 4) {
        this.addObj.sample = trees[2]
      this.addObj.sampleType = trees[4]
      if ((trees[5] === undefined || trees[5] === '') || trees.length === 6) {
        this.addObj.sample = trees[4]
      } else {
        this.addObj.sample = trees[3]
        this.addObj.sample = trees[5]
      }
      this.addObj.model = (trees[4] == undefined ? null : trees[4])
      this.addObj.model = (trees[6] == undefined ? null : trees[6])
      this.addObj.ifsInventoryId = this.customsInspection.id
      this.saveLoad = true
      if (this.addObj.createTime) {

 src/views/business/materialOrder/index.vue

@@ -74,7 +74,7 @@
          <div>
            <el-button v-show="tabIndex === 3 || tabIndex === 2" :loading="outLoading" size="small" type="primary"
              @click="handleOut">导出</el-button>
            <el-button v-if="tabIndex === 0" size="small" type="primary" @click="copper">铜材料下单</el-button>
            <!-- <el-button v-if="tabIndex === 0" size="small" type="primary" @click="copper">铜材料下单</el-button> -->
            <el-button v-if="tabIndex !== 0" size="small" type="primary" @click="openPrint">标签打印</el-button>
          </div>
        </div>

 src/views/business/productOrder/components/add.vue

@@ -20,10 +20,10 @@
          <el-button
            v-if="active == 1 && addObj.sampleType != undefined && (addObj.sampleType.indexOf('电缆') > -1 || addObj.sampleType.indexOf('综合') > -1)"
            size="small" type="primary" @click="openCableConfig">电缆配置</el-button>
          <el-button v-if="active == 1 && addObj.sampleType != undefined && addObj.sampleType.indexOf('电缆') > -1" size="small"
            type="primary" @click="openAuxiliaryCore">辅助线芯配置</el-button>
          <el-button v-show="active == 1 || (tabIndex == 4 && active == 2)" :loading="saveLoad" size="small" type="primary"
            @click="save">提交</el-button>
          <el-button v-if="active == 1 && addObj.sampleType != undefined && addObj.sampleType.indexOf('电缆') > -1"
            size="small" type="primary" @click="openAuxiliaryCore">辅助线芯配置</el-button>
          <el-button v-show="active == 1 || (tabIndex == 4 && active == 2)" :loading="saveLoad" size="small"
            type="primary" @click="save">提交</el-button>
          <!-- 审核 -->
          <el-button v-show="active == 3" :disabled="saveLoad" :loading="saveLoad" size="small"
            @click="upInsOrderOfState(2)">不通过</el-button>
@@ -144,14 +144,14 @@
            </el-col>
            <el-col :span="6">
              <el-form-item label="生产单位:" prop="production">
                <el-input v-model="addObj.production" :disabled="active > 1 && tabIndex != 4" clearable placeholder="请输入"
                  size="small"></el-input>
                <el-input v-model="addObj.production" :disabled="active > 1 && tabIndex != 4" clearable
                  placeholder="请输入" size="small"></el-input>
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="生产单位EN:" prop="productionEn">
                <el-input v-model="addObj.productionEn" :disabled="active > 1 && tabIndex != 4" clearable placeholder="请输入"
                  size="small"></el-input>
                <el-input v-model="addObj.productionEn" :disabled="active > 1 && tabIndex != 4" clearable
                  placeholder="请输入" size="small"></el-input>
              </el-form-item>
            </el-col>
            <el-col :span="6">
@@ -365,7 +365,8 @@
            <template slot="header" slot-scope="scope">
              <div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
                <span>试验方法</span>
                <el-input v-if="active == 1" v-model="methodS" placeholder="请输入" size="mini" @input="searchFilterList" />
                <el-input v-if="active == 1" v-model="methodS" placeholder="请输入" size="mini"
                  @input="searchFilterList" />
              </div>
            </template>
          </el-table-column>
@@ -522,8 +523,8 @@
            <div class="search_label" style="width: 80px;">要求值：</div>
            <div class="search_input">
              <el-radio-group v-model="item.bsm1Val" v-removeAriaHidden @input="upBsmAll(item)">
                <el-radio v-for="(a, ai) in JSON.parse(item.bsmRow.sectionCopy)" :key="ai"
                  :label="a">{{ JSON.parse(item.bsmRow.askCopy)[ai] }}</el-radio>
                <el-radio v-for="(a, ai) in JSON.parse(item.bsmRow.sectionCopy)" :key="ai" :label="a">{{
                  JSON.parse(item.bsmRow.askCopy)[ai] }}</el-radio>
              </el-radio-group>
            </div>
          </el-col>
@@ -1376,7 +1377,7 @@
    handleNodeClick(val, node, el) {
      this.selectTree = ''
      this.models = val.children
      this.selectTree = getReversedTreePath(node)
      this.selectTree = this.getReversedTreePath(node)
    },
    /**
   * 获取反向拼接的树路径字符串
@@ -1417,21 +1418,31 @@
    },
    activeStandardTree() {
      let trees = this.selectTree.split(" - ")
      if (trees.length < 3) {
      if (trees.length < 4) {
        this.$message.error('未选择对象')
        return
      }
      this.addObj.factory = trees[0]
      this.addObj.laboratory = trees[1]
      this.addObj.sampleType = trees[2]
      if (trees[3] === undefined || trees[3] === '' || trees[3] === '- ') {
        this.addObj.sample = trees[2]
      if (trees[2] == '包材' || trees[2] == '原辅材') {
        this.addObj.sampleType = trees[4]
        if (trees[5] === undefined || trees[5] === '' || trees[5] === '- ') {
          this.addObj.sample = trees[4]
        } else {
          this.addObj.sample = trees[5]
        }
        this.addObj.model = (trees[6] == undefined ? null : trees[6])
      } else {
        this.addObj.sample = trees[3]
        this.addObj.sampleType = trees[3]
        if (trees[4] === undefined || trees[4] === '' || trees[4] === '- ') {
          this.addObj.sample = trees[3]
        } else {
          this.addObj.sample = trees[4]
        }
        this.addObj.model = (trees[5] == undefined ? null : trees[5])
      }
      this.addObj.sampleView = this.addObj.sample
      this.addObj.sampleViewEn = this.sampleViewEn
      this.addObj.model = (trees[4] == undefined ? null : trees[4])
      this.selectStandardTree = false
      this.sampleList = []
      for (var i = 0; i < this.addObj.sampleNum; i++) {

 src/views/structural/capabilityAndLaboratory/capability/index.vue

@@ -282,6 +282,9 @@
              clickFun: (row) => {
                this.bindPartFirst(row);
              },
              disabled: (row) => {
                return row.product
              }
            },
            {
              name: '车间绑定',

 vue.config.js

@@ -36,7 +36,8 @@
    proxy: {
      // detail: https://cli.vuejs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
        target: `http://10.21.10.78:8089`,
        // target: `http://10.21.10.124:8001`, //本地
        target: `http://192.168.18.50:7002`, //测试库
        changeOrigin: true,
        pathRewrite: {
          ["^" + process.env.VUE_APP_BASE_API]: "",
@@ -67,6 +68,7 @@
            loader: "worker-loader",
            options: {
              inline: "fallback",
              filename: "[name].[contenthash].worker.js", // 添加内容哈希到文件名
            },
          },
        },